diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-19 10:02:04 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-19 10:02:04 +0000 |
| commit | 02737df8ca6ef9b3cee6bed0ceb0b35798769ae5 (patch) | |
| tree | 00acb88b1a5b7a3000078d72429cf6d4761be8bc /src | |
| parent | 9dc560a46f3e146b78ea525ee134c7fc4d5934e5 (diff) | |
Try to make it build with wxwidgets 2.8 as well as 2.9
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/film_viewer.cc | 18 | ||||
| -rw-r--r-- | src/wx/film_viewer.h | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index e4c02d8eb..16266f9d5 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -56,7 +56,9 @@ FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p) , _panel_height (0) { _panel->SetDoubleBuffered (true); +#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9 _panel->SetBackgroundStyle (wxBG_STYLE_PAINT); +#endif wxBoxSizer* v_sizer = new wxBoxSizer (wxVERTICAL); SetSizer (v_sizer); @@ -69,13 +71,13 @@ FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p) v_sizer->Add (h_sizer, 0, wxEXPAND); - _panel->Bind (wxEVT_PAINT, &FilmViewer::paint_panel, this); - _panel->Bind (wxEVT_SIZE, &FilmViewer::panel_sized, this); - _slider->Bind (wxEVT_SCROLL_THUMBTRACK, &FilmViewer::slider_moved, this); - _slider->Bind (wxEVT_SCROLL_PAGEUP, &FilmViewer::slider_moved, this); - _slider->Bind (wxEVT_SCROLL_PAGEDOWN, &FilmViewer::slider_moved, this); - _play_button->Bind (wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, &FilmViewer::play_clicked, this); - _timer.Bind (wxEVT_TIMER, &FilmViewer::timer, this); + _panel->Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (FilmViewer::paint_panel), 0, this); + _panel->Connect (wxID_ANY, wxEVT_SIZE, wxSizeEventHandler (FilmViewer::panel_sized), 0, this); + _slider->Connect (wxID_ANY, wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler (FilmViewer::slider_moved), 0, this); + _slider->Connect (wxID_ANY, wxEVT_SCROLL_PAGEUP, wxScrollEventHandler (FilmViewer::slider_moved), 0, this); + _slider->Connect (wxID_ANY, wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler (FilmViewer::slider_moved), 0, this); + _play_button->Connect (wxID_ANY, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler (FilmViewer::play_clicked), 0, this); + _timer.Connect (wxID_ANY, wxEVT_TIMER, wxTimerEventHandler (FilmViewer::timer), 0, this); set_film (_film); @@ -203,7 +205,7 @@ FilmViewer::paint_panel (wxPaintEvent& ev) void -FilmViewer::slider_moved (wxCommandEvent& ev) +FilmViewer::slider_moved (wxScrollEvent &) { if (!_film || !_film->length()) { return; diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index 723214ed1..dbaf8eee2 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -45,7 +45,7 @@ private: void film_changed (Film::Property); void paint_panel (wxPaintEvent &); void panel_sized (wxSizeEvent &); - void slider_moved (wxCommandEvent &); + void slider_moved (wxScrollEvent &); void play_clicked (wxCommandEvent &); void timer (wxTimerEvent &); void process_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>); |