Tidy up ScreensPanel code a bit.

1 files changed, 9 insertions, 6 deletions

diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index 829208880..0095937b7 100644
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -48,8 +48,6 @@ private:
 	void add_screen_clicked ();
 	void edit_screen_clicked ();
 	void remove_screen_clicked ();
-	std::list<std::pair<wxTreeItemId, boost::shared_ptr<Cinema> > > selected_cinemas () const;
-	std::list<std::pair<wxTreeItemId, boost::shared_ptr<Screen> > > selected_screens () const;
 	void selection_changed (wxTreeEvent &);
 	void search_changed ();
 
@@ -62,9 +60,14 @@ private:
 	wxButton* _edit_screen;
 	wxButton* _remove_screen;
 	wxTreeItemId _root;
-	std::map<wxTreeItemId, boost::shared_ptr<Cinema> > _cinemas;
-	std::map<wxTreeItemId, boost::shared_ptr<Screen> > _screens;
-	std::list<boost::shared_ptr<Cinema> > _selected_cinemas;
-	std::list<boost::shared_ptr<Screen> > _selected_screens;
+
+	typedef std::map<wxTreeItemId, boost::shared_ptr<Cinema> > CinemaMap;
+	typedef std::map<wxTreeItemId, boost::shared_ptr<Screen> > ScreenMap;
+
+	CinemaMap _cinemas;
+	ScreenMap _screens;
+	CinemaMap _selected_cinemas;
+	ScreenMap _selected_screens;
+
 	bool _ignore_selection_change;
 };