wx: bunch more event function parameter changes

diff --git a/modules/gui/wxwindows/playlist.cpp b/modules/gui/wxwindows/playlist.cpp
index e700ab47636eff79f0fef0c7db86e64807486b4e..90042a648dca74f7ff55a9e7c72e5ba1a019dddd 100644 (file)
--- a/modules/gui/wxwindows/playlist.cpp
+++ b/modules/gui/wxwindows/playlist.cpp
@@ -957,7 +957,7 @@ void Playlist::DeleteNode( playlist_item_t *p_item )
 }
 
 
-void Playlist::OnClose( wxCommandEvent& WXUNUSED(event) )
+void Playlist::OnClose( wxCloseEvent& WXUNUSED(event) )
 {
     Hide();
 }
@@ -1452,7 +1452,7 @@ void Playlist::OnPopup( wxContextMenuEvent& event )
     }
 }
 
-void Playlist::OnPopupPlay( wxMenuEvent& event )
+void Playlist::OnPopupPlay( wxCommandEvent& event )
 {
     playlist_t *p_playlist =
         (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
@@ -1491,7 +1491,7 @@ void Playlist::OnPopupPlay( wxMenuEvent& event )
     vlc_object_release( p_playlist );
 }
 
-void Playlist::OnPopupPreparse( wxMenuEvent& event )
+void Playlist::OnPopupPreparse( wxCommandEvent& event )
 {
     playlist_t *p_playlist =
         (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
@@ -1528,7 +1528,7 @@ void Playlist::Preparse( playlist_t *p_playlist )
     }
 }
 
-void Playlist::OnPopupDel( wxMenuEvent& event )
+void Playlist::OnPopupDel( wxCommandEvent& event )
 {
     PlaylistItem *p_wxitem;
 
@@ -1544,7 +1544,7 @@ void Playlist::OnPopupDel( wxMenuEvent& event )
     }
 }
 
-void Playlist::OnPopupSort( wxMenuEvent& event )
+void Playlist::OnPopupSort( wxCommandEvent& event )
 {
     PlaylistItem *p_wxitem;
 
@@ -1570,7 +1570,7 @@ void Playlist::OnPopupSort( wxMenuEvent& event )
     }
 }
 
-void Playlist::OnPopupInfo( wxMenuEvent& event )
+void Playlist::OnPopupInfo( wxCommandEvent& event )
 {
     if( p_popup_item )
     {

diff --git a/modules/gui/wxwindows/preferences.cpp b/modules/gui/wxwindows/preferences.cpp
index 7326c0a84b48a0935aeb6d1fa05cc4782db15fd8..404f2e12638c5d41fb9637a97d0689bff4c43d57 100644 (file)
--- a/modules/gui/wxwindows/preferences.cpp
+++ b/modules/gui/wxwindows/preferences.cpp
@@ -269,7 +269,7 @@ void PrefsDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
     prefs_tree->CleanChanges();
 }
 
-void PrefsDialog::OnCancel( wxCommandEvent& WXUNUSED(event) )
+void PrefsDialog::OnCancel( wxEvent& WXUNUSED(event) )
 {
     this->Hide();
     prefs_tree->CleanChanges();

diff --git a/modules/gui/wxwindows/preferences_widgets.cpp b/modules/gui/wxwindows/preferences_widgets.cpp
index cb01dbb99541f08869595a48ddb366d89b5fe5c3..ca64d62113f8cd24e2ece21423244e890035446a 100644 (file)
--- a/modules/gui/wxwindows/preferences_widgets.cpp
+++ b/modules/gui/wxwindows/preferences_widgets.cpp
@@ -159,7 +159,7 @@ void ConfigControl::SetUpdateCallback( void (*p_callback)( void * ),
     p_update_data = p_data;
 }
 
-void ConfigControl::OnUpdate( wxCommandEvent& WXUNUSED(event) )
+void ConfigControl::OnUpdate( wxEvent& WXUNUSED(event) )
 {
     if( pf_update_callback )
     {
@@ -743,7 +743,7 @@ int IntegerConfigControl::GetIntValue()
     return i_value; //spin->GetValue();
 }
 
-void IntegerConfigControl::OnUpdate( wxCommandEvent &event )
+void IntegerConfigControl::OnUpdate( wxScrollEvent &event )
 {
     i_value = event.GetInt();
     ConfigControl::OnUpdate( event );

diff --git a/modules/gui/wxwindows/preferences_widgets.h b/modules/gui/wxwindows/preferences_widgets.h
index 6765df7dca0f6644d0801a5892849fcf30b8c259..c48707a52ec500d3827027861259db1e848e27e2 100644 (file)
--- a/modules/gui/wxwindows/preferences_widgets.h
+++ b/modules/gui/wxwindows/preferences_widgets.h
@@ -48,7 +48,7 @@ protected:
     void (*pf_update_callback)( void * );
     void *p_update_data;
 
-    void OnUpdate( wxCommandEvent& );
+    void OnUpdate( wxEvent& );
 
 private:
     wxString name;
@@ -170,7 +170,7 @@ private:
     wxSpinCtrl *spin;
     int i_value;
 
-    void OnUpdate( wxCommandEvent& );
+    void OnUpdate( wxScrollEvent& );
 
     DECLARE_EVENT_TABLE()
 };

diff --git a/modules/gui/wxwindows/wxwindows.h b/modules/gui/wxwindows/wxwindows.h
index 39850c5069e1370a5c6fd79df049989b8a988a0b..ec475ecf3c71ab465222e522b54045488599fc02 100644 (file)
--- a/modules/gui/wxwindows/wxwindows.h
+++ b/modules/gui/wxwindows/wxwindows.h
@@ -774,7 +774,7 @@ private:
 
     /* Event handlers (these functions should _not_ be virtual) */
     void OnOk( wxCommandEvent& event );
-    void OnCancel( wxCommandEvent& event );
+    void OnCancel( wxEvent& event );
     void OnSave( wxCommandEvent& event );
     void OnResetAll( wxCommandEvent& event );
     void OnAdvanced( wxCommandEvent& event );
@@ -842,7 +842,7 @@ private:
     void OnAddFile( wxCommandEvent& event );
     void OnAddDir( wxCommandEvent& event );
     void OnAddMRL( wxCommandEvent& event );
-    void OnClose( wxCommandEvent& event );
+    void OnClose( wxCloseEvent& event );
 
     void OnEnableSelection( wxCommandEvent& event );
     void OnDisableSelection( wxCommandEvent& event );
@@ -895,12 +895,12 @@ private:
     playlist_item_t *p_popup_item;
     playlist_item_t *p_popup_parent;
     void OnPopup( wxContextMenuEvent& event );
-    void OnPopupPlay( wxMenuEvent& event );
-    void OnPopupPreparse( wxMenuEvent& event );
-    void OnPopupSort( wxMenuEvent& event );
-    void OnPopupDel( wxMenuEvent& event );
-    void OnPopupEna( wxMenuEvent& event );
-    void OnPopupInfo( wxMenuEvent& event );
+    void OnPopupPlay( wxCommandEvent& event );
+    void OnPopupPreparse( wxCommandEvent& event );
+    void OnPopupSort( wxCommandEvent& event );
+    void OnPopupDel( wxCommandEvent& event );
+    void OnPopupEna( wxCommandEvent& event );
+    void OnPopupInfo( wxCommandEvent& event );
     void Rebuild( vlc_bool_t );
 
     void Preparse( playlist_t *p_playlist );