diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-04 20:46:12 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-05 01:42:17 +0000 |
| commit | 2034a89f30e4a976e44eb8d0a6b4ad6e3100cd4b (patch) | |
| tree | 7a232c3f1442f3797b50c648a8e70f9bee91db5a /src/wx | |
| parent | 03b501578c49861a486116534d95617959d92240 (diff) | |
Add console to dcpomatic_kdm on Windows. Tweak layout a bit more.
Remove unnecessary include from kdm_dialog.h.
Unbind selection-changed signal in ScreensPanel destructor to stop
it causing problems if it is called during ~ScreensPanel.
Add -fno-omit-frame-pointer in case it helps with Dr. Mingw.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/kdm_dialog.h | 3 | ||||
| -rw-r--r-- | src/wx/screens_panel.cc | 10 | ||||
| -rw-r--r-- | src/wx/screens_panel.h | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h index 6400ebb6c..a9edd121a 100644 --- a/src/wx/kdm_dialog.h +++ b/src/wx/kdm_dialog.h @@ -20,13 +20,10 @@ #include "wx_util.h" #include <dcp/types.h> #include <wx/wx.h> -#include <wx/treectrl.h> #include <boost/shared_ptr.hpp> #include <boost/date_time/posix_time/posix_time.hpp> #include <map> -class wxTreeCtrl; - class Cinema; class Screen; class Film; diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index ce5f2555e..2130600e4 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -27,6 +27,7 @@ using std::list; using std::pair; +using std::cout; using std::map; using std::make_pair; using boost::shared_ptr; @@ -69,7 +70,7 @@ ScreensPanel::ScreensPanel (wxWindow* parent) sizer->Add (targets, 1, wxEXPAND); - _targets->Bind (wxEVT_COMMAND_TREE_SEL_CHANGED, boost::bind (&ScreensPanel::selection_changed, this)); + _targets->Bind (wxEVT_COMMAND_TREE_SEL_CHANGED, &ScreensPanel::selection_changed, this); _add_cinema->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreensPanel::add_cinema_clicked, this)); _edit_cinema->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreensPanel::edit_cinema_clicked, this)); @@ -82,6 +83,11 @@ ScreensPanel::ScreensPanel (wxWindow* parent) SetSizer (sizer); } +ScreensPanel::~ScreensPanel () +{ + _targets->Unbind (wxEVT_COMMAND_TREE_SEL_CHANGED, &ScreensPanel::selection_changed, this); +} + list<pair<wxTreeItemId, shared_ptr<Cinema> > > ScreensPanel::selected_cinemas () const { @@ -299,7 +305,7 @@ ScreensPanel::screens () const } void -ScreensPanel::selection_changed () +ScreensPanel::selection_changed (wxTreeEvent &) { setup_sensitivity (); ScreensChanged (); diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h index f7d81b961..6cfff0a60 100644 --- a/src/wx/screens_panel.h +++ b/src/wx/screens_panel.h @@ -30,6 +30,7 @@ class ScreensPanel : public wxPanel { public: ScreensPanel (wxWindow* parent); + ~ScreensPanel (); std::list<boost::shared_ptr<Screen> > screens () const; void setup_sensitivity (); @@ -47,7 +48,7 @@ private: 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 (); + void selection_changed (wxTreeEvent &); wxTreeCtrl* _targets; wxButton* _add_cinema; |