wx: bunch more event function parameter changes

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 )
     {

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();

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 );

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()
 };

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 );