Use wx 2.9 binding API.

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index e8b1db3823948861589c610fc66cd71342b4627c..4fbb72708c22a44243010ae3a936574615f38ad9 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -87,11 +87,12 @@ AudioPanel::AudioPanel (FilmEditor* e)
        _gain->SetRange (-60, 60);
        _delay->SetRange (-1000, 1000);
 
-       _delay->Connect  (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (AudioPanel::delay_changed), 0, this);
-       _stream->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,  wxCommandEventHandler (AudioPanel::stream_changed), 0, this);
-       _show->Connect   (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,   wxCommandEventHandler (AudioPanel::show_clicked), 0, this);
-       _gain->Connect   (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (AudioPanel::gain_changed), 0, this);
-       _gain_calculate_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (AudioPanel::gain_calculate_button_clicked), 0, this);
+       _delay->Bind                 (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&AudioPanel::delay_changed, this));
+       _stream->Bind                (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&AudioPanel::stream_changed, this));
+       _show->Bind                  (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&AudioPanel::show_clicked, this));
+       _gain->Bind                  (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&AudioPanel::gain_changed, this));
+       _gain_calculate_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&AudioPanel::gain_calculate_button_clicked, this));
+
        _mapping->Changed.connect (boost::bind (&AudioPanel::mapping_changed, this, _1));
 }
 
@@ -142,7 +143,7 @@ AudioPanel::film_content_changed (shared_ptr<Content> c, int property)
 }
 
 void
-AudioPanel::gain_changed (wxCommandEvent &)
+AudioPanel::gain_changed ()
 {
        shared_ptr<AudioContent> ac = _editor->selected_audio_content ();
        if (!ac) {
@@ -153,7 +154,7 @@ AudioPanel::gain_changed (wxCommandEvent &)
 }
 
 void
-AudioPanel::delay_changed (wxCommandEvent &)
+AudioPanel::delay_changed ()
 {
        shared_ptr<AudioContent> ac = _editor->selected_audio_content ();
        if (!ac) {
@@ -164,7 +165,7 @@ AudioPanel::delay_changed (wxCommandEvent &)
 }
 
 void
-AudioPanel::gain_calculate_button_clicked (wxCommandEvent &)
+AudioPanel::gain_calculate_button_clicked ()
 {
        GainCalculatorDialog* d = new GainCalculatorDialog (this);
        d->ShowModal ();
@@ -184,14 +185,13 @@ AudioPanel::gain_calculate_button_clicked (wxCommandEvent &)
        /* This appears to be necessary, as the change is not signalled,
           I think.
        */
-       wxCommandEvent dummy;
-       gain_changed (dummy);
+       gain_changed ();
        
        d->Destroy ();
 }
 
 void
-AudioPanel::show_clicked (wxCommandEvent &)
+AudioPanel::show_clicked ()
 {
        if (_audio_dialog) {
                _audio_dialog->Destroy ();
@@ -214,7 +214,7 @@ AudioPanel::show_clicked (wxCommandEvent &)
 }
 
 void
-AudioPanel::stream_changed (wxCommandEvent &)
+AudioPanel::stream_changed ()
 {
        shared_ptr<Content> c = _editor->selected_content ();
        if (!c) {

diff --git a/src/wx/audio_panel.h b/src/wx/audio_panel.h
index 8a6402c9ef27235ffca22f6c966e721c5b4a270d..fb2d9296680d2b46604d09634941ecb97356b206 100644 (file)
--- a/src/wx/audio_panel.h
+++ b/src/wx/audio_panel.h
@@ -35,11 +35,11 @@ public:
        void film_content_changed (boost::shared_ptr<Content>, int);
        
 private:
-       void gain_changed (wxCommandEvent &);
-       void gain_calculate_button_clicked (wxCommandEvent &);
-       void show_clicked (wxCommandEvent &);
-       void delay_changed (wxCommandEvent &);
-       void stream_changed (wxCommandEvent &);
+       void gain_changed ();
+       void gain_calculate_button_clicked ();
+       void show_clicked ();
+       void delay_changed ();
+       void stream_changed ();
        void mapping_changed (AudioMapping);
 
        wxSpinCtrl* _gain;

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 4a3781ecd448e60b6f4cdd969cdd0b903da2f35e..76c9d7812f4e31fd3032df3ead9365f1958de3c1 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -205,25 +205,25 @@ FilmEditor::make_dcp_panel ()
 void
 FilmEditor::connect_to_widgets ()
 {
-       _name->Connect                   (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED,         wxCommandEventHandler (FilmEditor::name_changed), 0, this);
-       _use_dci_name->Connect           (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::use_dci_name_toggled), 0, this);
-       _edit_dci_button->Connect        (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::edit_dci_button_clicked), 0, this);
-       _container->Connect              (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::container_changed), 0, this);
-       _content->Connect                (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED,   wxListEventHandler    (FilmEditor::content_selection_changed), 0, this);
-       _content->Connect                (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler    (FilmEditor::content_selection_changed), 0, this);
-       _content->Connect                (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK,wxListEventHandler    (FilmEditor::content_right_click), 0, this);
-       _content_add->Connect            (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_add_clicked), 0, this);
-       _content_remove->Connect         (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_remove_clicked), 0, this);
-       _content_timeline->Connect       (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_timeline_clicked), 0, this);
-       _scaler->Connect                 (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::scaler_changed), 0, this);
-       _dcp_content_type->Connect       (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::dcp_content_type_changed), 0, this);
-       _frame_rate->Connect             (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::frame_rate_changed), 0, this);
-       _best_frame_rate->Connect        (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::best_frame_rate_clicked), 0, this);
-       _audio_channels->Connect         (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::audio_channels_changed), 0, this);
-       _j2k_bandwidth->Connect          (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::j2k_bandwidth_changed), 0, this);
-       _resolution->Connect             (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::resolution_changed), 0, this);
-       _sequence_video->Connect         (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::sequence_video_changed), 0, this);
-       _three_d->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::three_d_changed, this));
+       _name->Bind             (wxEVT_COMMAND_TEXT_UPDATED,          boost::bind (&FilmEditor::name_changed, this));
+       _use_dci_name->Bind     (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&FilmEditor::use_dci_name_toggled, this));
+       _edit_dci_button->Bind  (wxEVT_COMMAND_BUTTON_CLICKED,        boost::bind (&FilmEditor::edit_dci_button_clicked, this));
+       _container->Bind        (wxEVT_COMMAND_CHOICE_SELECTED,       boost::bind (&FilmEditor::container_changed, this));
+       _content->Bind          (wxEVT_COMMAND_LIST_ITEM_SELECTED,    boost::bind (&FilmEditor::content_selection_changed, this));
+       _content->Bind          (wxEVT_COMMAND_LIST_ITEM_DESELECTED,  boost::bind (&FilmEditor::content_selection_changed, this));
+       _content->Bind          (wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, boost::bind (&FilmEditor::content_right_click, this, _1));
+       _content_add->Bind      (wxEVT_COMMAND_BUTTON_CLICKED,        boost::bind (&FilmEditor::content_add_clicked, this));
+       _content_remove->Bind   (wxEVT_COMMAND_BUTTON_CLICKED,        boost::bind (&FilmEditor::content_remove_clicked, this));
+       _content_timeline->Bind (wxEVT_COMMAND_BUTTON_CLICKED,        boost::bind (&FilmEditor::content_timeline_clicked, this));
+       _scaler->Bind           (wxEVT_COMMAND_CHOICE_SELECTED,       boost::bind (&FilmEditor::scaler_changed, this));
+       _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED,       boost::bind (&FilmEditor::dcp_content_type_changed, this));
+       _frame_rate->Bind       (wxEVT_COMMAND_CHOICE_SELECTED,       boost::bind (&FilmEditor::frame_rate_changed, this));
+       _best_frame_rate->Bind  (wxEVT_COMMAND_BUTTON_CLICKED,        boost::bind (&FilmEditor::best_frame_rate_clicked, this));
+       _audio_channels->Bind   (wxEVT_COMMAND_SPINCTRL_UPDATED,      boost::bind (&FilmEditor::audio_channels_changed, this));
+       _j2k_bandwidth->Bind    (wxEVT_COMMAND_SPINCTRL_UPDATED,      boost::bind (&FilmEditor::j2k_bandwidth_changed, this));
+       _resolution->Bind       (wxEVT_COMMAND_CHOICE_SELECTED,       boost::bind (&FilmEditor::resolution_changed, this));
+       _sequence_video->Bind   (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&FilmEditor::sequence_video_changed, this));
+       _three_d->Bind          (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&FilmEditor::three_d_changed, this));
 }
 
 void
@@ -273,7 +273,7 @@ FilmEditor::make_content_panel ()
 
 /** Called when the name widget has been changed */
 void
-FilmEditor::name_changed (wxCommandEvent &)
+FilmEditor::name_changed ()
 {
        if (!_film) {
                return;
@@ -283,7 +283,7 @@ FilmEditor::name_changed (wxCommandEvent &)
 }
 
 void
-FilmEditor::j2k_bandwidth_changed (wxCommandEvent &)
+FilmEditor::j2k_bandwidth_changed ()
 {
        if (!_film) {
                return;
@@ -293,7 +293,7 @@ FilmEditor::j2k_bandwidth_changed (wxCommandEvent &)
 }
 
 void
-FilmEditor::frame_rate_changed (wxCommandEvent &)
+FilmEditor::frame_rate_changed ()
 {
        if (!_film) {
                return;
@@ -307,7 +307,7 @@ FilmEditor::frame_rate_changed (wxCommandEvent &)
 }
 
 void
-FilmEditor::audio_channels_changed (wxCommandEvent &)
+FilmEditor::audio_channels_changed ()
 {
        if (!_film) {
                return;
@@ -317,7 +317,7 @@ FilmEditor::audio_channels_changed (wxCommandEvent &)
 }
 
 void
-FilmEditor::resolution_changed (wxCommandEvent &)
+FilmEditor::resolution_changed ()
 {
        if (!_film) {
                return;
@@ -462,7 +462,7 @@ FilmEditor::setup_container ()
 
 /** Called when the container widget has been changed */
 void
-FilmEditor::container_changed (wxCommandEvent &)
+FilmEditor::container_changed ()
 {
        if (!_film) {
                return;
@@ -478,7 +478,7 @@ FilmEditor::container_changed (wxCommandEvent &)
 
 /** Called when the DCP content type widget has been changed */
 void
-FilmEditor::dcp_content_type_changed (wxCommandEvent &)
+FilmEditor::dcp_content_type_changed ()
 {
        if (!_film) {
                return;
@@ -496,8 +496,7 @@ FilmEditor::set_film (shared_ptr<Film> f)
 {
        set_general_sensitivity (f != 0);
 
-       wxListEvent ev;
-       content_selection_changed (ev);
+       content_selection_changed ();
 
        if (_film == f) {
                return;
@@ -568,7 +567,7 @@ FilmEditor::set_general_sensitivity (bool s)
 
 /** Called when the scaler widget has been changed */
 void
-FilmEditor::scaler_changed (wxCommandEvent &)
+FilmEditor::scaler_changed ()
 {
        if (!_film) {
                return;
@@ -581,7 +580,7 @@ FilmEditor::scaler_changed (wxCommandEvent &)
 }
 
 void
-FilmEditor::use_dci_name_toggled (wxCommandEvent &)
+FilmEditor::use_dci_name_toggled ()
 {
        if (!_film) {
                return;
@@ -591,7 +590,7 @@ FilmEditor::use_dci_name_toggled (wxCommandEvent &)
 }
 
 void
-FilmEditor::edit_dci_button_clicked (wxCommandEvent &)
+FilmEditor::edit_dci_button_clicked ()
 {
        if (!_film) {
                return;
@@ -622,7 +621,7 @@ FilmEditor::setup_dcp_name ()
 }
 
 void
-FilmEditor::best_frame_rate_clicked (wxCommandEvent &)
+FilmEditor::best_frame_rate_clicked ()
 {
        if (!_film) {
                return;
@@ -658,7 +657,7 @@ FilmEditor::setup_content ()
 }
 
 void
-FilmEditor::content_add_clicked (wxCommandEvent &)
+FilmEditor::content_add_clicked ()
 {
        wxFileDialog* d = new wxFileDialog (this, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE);
        int const r = d->ShowModal ();
@@ -689,19 +688,18 @@ FilmEditor::content_add_clicked (wxCommandEvent &)
 }
 
 void
-FilmEditor::content_remove_clicked (wxCommandEvent &)
+FilmEditor::content_remove_clicked ()
 {
        shared_ptr<Content> c = selected_content ();
        if (c) {
                _film->remove_content (c);
        }
 
-       wxListEvent ev;
-       content_selection_changed (ev);
+       content_selection_changed ();
 }
 
 void
-FilmEditor::content_selection_changed (wxListEvent &)
+FilmEditor::content_selection_changed ()
 {
        setup_content_sensitivity ();
        shared_ptr<Content> s = selected_content ();
@@ -793,7 +791,7 @@ FilmEditor::selected_subtitle_content ()
 }
 
 void
-FilmEditor::content_timeline_clicked (wxCommandEvent &)
+FilmEditor::content_timeline_clicked ()
 {
        if (_timeline_dialog) {
                _timeline_dialog->Destroy ();
@@ -818,7 +816,7 @@ FilmEditor::set_selection (weak_ptr<Content> wc)
 }
 
 void
-FilmEditor::sequence_video_changed (wxCommandEvent &)
+FilmEditor::sequence_video_changed ()
 {
        if (!_film) {
                return;

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 49b09146875b8367b39eeafd2f87aa5efb116d36..0f62f4479b61dbf62da49c856cc2f30b46461ac9 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -72,22 +72,22 @@ private:
        void connect_to_widgets ();
        
        /* Handle changes to the view */
-       void name_changed (wxCommandEvent &);
-       void use_dci_name_toggled (wxCommandEvent &);
-       void edit_dci_button_clicked (wxCommandEvent &);
-       void content_selection_changed (wxListEvent &);
-       void content_add_clicked (wxCommandEvent &);
-       void content_remove_clicked (wxCommandEvent &);
-       void container_changed (wxCommandEvent &);
-       void dcp_content_type_changed (wxCommandEvent &);
-       void scaler_changed (wxCommandEvent &);
-       void j2k_bandwidth_changed (wxCommandEvent &);
-       void frame_rate_changed (wxCommandEvent &);
-       void best_frame_rate_clicked (wxCommandEvent &);
-       void content_timeline_clicked (wxCommandEvent &);
-       void audio_channels_changed (wxCommandEvent &);
-       void resolution_changed (wxCommandEvent &);
-       void sequence_video_changed (wxCommandEvent &);
+       void name_changed ();
+       void use_dci_name_toggled ();
+       void edit_dci_button_clicked ();
+       void content_selection_changed ();
+       void content_add_clicked ();
+       void content_remove_clicked ();
+       void container_changed ();
+       void dcp_content_type_changed ();
+       void scaler_changed ();
+       void j2k_bandwidth_changed ();
+       void frame_rate_changed ();
+       void best_frame_rate_clicked ();
+       void content_timeline_clicked ();
+       void audio_channels_changed ();
+       void resolution_changed ();
+       void sequence_video_changed ();
        void content_right_click (wxListEvent &);
        void three_d_changed ();
 

diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index 2cc5197ce2a8d9e197e5521e17a47a17952d71ba..b80259e8eae5a11073064e465303c74565bc53ee 100644 (file)
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -65,10 +65,10 @@ SubtitlePanel::SubtitlePanel (FilmEditor* e)
        _scale->SetRange (1, 1000);
        _scale->SetValue (100);
 
-       _with_subtitles->Connect  (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (SubtitlePanel::with_subtitles_toggled), 0, this);
-       _offset->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (SubtitlePanel::offset_changed), 0, this);
-       _scale->Connect  (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (SubtitlePanel::scale_changed), 0, this);
-       _stream->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,  wxCommandEventHandler (SubtitlePanel::stream_changed), 0, this);
+       _with_subtitles->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::with_subtitles_toggled, this));
+       _offset->Bind         (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::offset_changed, this));
+       _scale->Bind          (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::scale_changed, this));
+       _stream->Bind         (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&SubtitlePanel::stream_changed, this));
 }
 
 void
@@ -117,7 +117,7 @@ SubtitlePanel::film_content_changed (shared_ptr<Content> c, int property)
 }
 
 void
-SubtitlePanel::with_subtitles_toggled (wxCommandEvent &)
+SubtitlePanel::with_subtitles_toggled ()
 {
        if (!_editor->film()) {
                return;
@@ -143,7 +143,7 @@ SubtitlePanel::setup_sensitivity ()
 }
 
 void
-SubtitlePanel::stream_changed (wxCommandEvent &)
+SubtitlePanel::stream_changed ()
 {
        shared_ptr<Content> c = _editor->selected_content ();
        if (!c) {
@@ -168,7 +168,7 @@ SubtitlePanel::stream_changed (wxCommandEvent &)
 }
 
 void
-SubtitlePanel::offset_changed (wxCommandEvent &)
+SubtitlePanel::offset_changed ()
 {
        shared_ptr<SubtitleContent> c = _editor->selected_subtitle_content ();
        if (!c) {
@@ -179,7 +179,7 @@ SubtitlePanel::offset_changed (wxCommandEvent &)
 }
 
 void
-SubtitlePanel::scale_changed (wxCommandEvent &)
+SubtitlePanel::scale_changed ()
 {
        shared_ptr<SubtitleContent> c = _editor->selected_subtitle_content ();
        if (!c) {

diff --git a/src/wx/subtitle_panel.h b/src/wx/subtitle_panel.h
index c2891f86da247a614184e3c07ebda2e40425e28e..3f795189593dba1972715760686d4149c7b7db48 100644 (file)
--- a/src/wx/subtitle_panel.h
+++ b/src/wx/subtitle_panel.h
@@ -32,10 +32,10 @@ public:
 
        
 private:
-       void with_subtitles_toggled (wxCommandEvent &);
-       void offset_changed (wxCommandEvent &);
-       void scale_changed (wxCommandEvent &);
-       void stream_changed (wxCommandEvent &);
+       void with_subtitles_toggled ();
+       void offset_changed ();
+       void scale_changed ();
+       void stream_changed ();
 
        void setup_sensitivity ();
        

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index ce0c869ffbfc464a9bcf10d2dfb5a42391298952..d0c99f6068484866a26046e71cf5b02c621b5a96 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -104,19 +104,19 @@ VideoPanel::VideoPanel (FilmEditor* e)
        _frame_type->Append (_("2D"));
        _frame_type->Append (_("3D left/right"));
 
-       _frame_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, bind (&VideoPanel::frame_type_changed, this));
-       _left_crop->Connect      (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (VideoPanel::left_crop_changed), 0, this);
-       _right_crop->Connect     (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (VideoPanel::right_crop_changed), 0, this);
-       _top_crop->Connect       (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (VideoPanel::top_crop_changed), 0, this);
-       _bottom_crop->Connect    (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (VideoPanel::bottom_crop_changed), 0, this);
-       _ratio->Connect          (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,  wxCommandEventHandler (VideoPanel::ratio_changed), 0, this);
-       _filters_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,   wxCommandEventHandler (VideoPanel::edit_filters_clicked), 0, this);
+       _frame_type->Bind     (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&VideoPanel::frame_type_changed, this));
+       _left_crop->Bind      (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::left_crop_changed, this));
+       _right_crop->Bind     (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::right_crop_changed, this));
+       _top_crop->Bind       (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::top_crop_changed, this));
+       _bottom_crop->Bind    (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::bottom_crop_changed, this));
+       _ratio->Bind          (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&VideoPanel::ratio_changed, this));
+       _filters_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_filters_clicked, this));
 }
 
 
 /** Called when the left crop widget has been changed */
 void
-VideoPanel::left_crop_changed (wxCommandEvent &)
+VideoPanel::left_crop_changed ()
 {
        shared_ptr<VideoContent> c = _editor->selected_video_content ();
        if (!c) {
@@ -128,7 +128,7 @@ VideoPanel::left_crop_changed (wxCommandEvent &)
 
 /** Called when the right crop widget has been changed */
 void
-VideoPanel::right_crop_changed (wxCommandEvent &)
+VideoPanel::right_crop_changed ()
 {
        shared_ptr<VideoContent> c = _editor->selected_video_content ();
        if (!c) {
@@ -140,7 +140,7 @@ VideoPanel::right_crop_changed (wxCommandEvent &)
 
 /** Called when the top crop widget has been changed */
 void
-VideoPanel::top_crop_changed (wxCommandEvent &)
+VideoPanel::top_crop_changed ()
 {
        shared_ptr<VideoContent> c = _editor->selected_video_content ();
        if (!c) {
@@ -152,7 +152,7 @@ VideoPanel::top_crop_changed (wxCommandEvent &)
 
 /** Called when the bottom crop value has been changed */
 void
-VideoPanel::bottom_crop_changed (wxCommandEvent &)
+VideoPanel::bottom_crop_changed ()
 {
        shared_ptr<VideoContent> c = _editor->selected_video_content ();
        if (!c) {
@@ -222,7 +222,7 @@ VideoPanel::film_content_changed (shared_ptr<Content> c, int property)
 
 /** Called when the `Edit filters' button has been clicked */
 void
-VideoPanel::edit_filters_clicked (wxCommandEvent &)
+VideoPanel::edit_filters_clicked ()
 {
        shared_ptr<Content> c = _editor->selected_content ();
        if (!c) {
@@ -307,7 +307,7 @@ VideoPanel::setup_scaling_description ()
 
 
 void
-VideoPanel::ratio_changed (wxCommandEvent &)
+VideoPanel::ratio_changed ()
 {
        if (!_editor->film ()) {
                return;

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 51a593e751921b5f9c372f4efcbb09cfd3525042..4bd526d499d0cd1c7d85c7425f64991211d17da7 100644 (file)
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -34,12 +34,12 @@ public:
        void film_content_changed (boost::shared_ptr<Content>, int);
 
 private:
-       void left_crop_changed (wxCommandEvent &);
-       void right_crop_changed (wxCommandEvent &);
-       void top_crop_changed (wxCommandEvent &);
-       void bottom_crop_changed (wxCommandEvent &);
-       void edit_filters_clicked (wxCommandEvent &);
-       void ratio_changed (wxCommandEvent &);
+       void left_crop_changed ();
+       void right_crop_changed ();
+       void top_crop_changed ();
+       void bottom_crop_changed ();
+       void edit_filters_clicked ();
+       void ratio_changed ();
        void frame_type_changed ();
 
        void setup_scaling_description ();