wx: last bunch of changes for now. The rest must be fixed by someone with msvc

diff --git a/modules/gui/wxwindows/fileinfo.cpp b/modules/gui/wxwindows/fileinfo.cpp
index 09f2d5c3227380d540e66c72b3f4d1f487caa351..c84684d4340f85d5d09761e94298670688db26a2 100644 (file)
--- a/modules/gui/wxwindows/fileinfo.cpp
+++ b/modules/gui/wxwindows/fileinfo.cpp
@@ -160,7 +160,7 @@ FileInfo::~FileInfo()
 {
 }
 
-void FileInfo::OnClose( wxCommandEvent& event )
+void FileInfo::OnClose( wxCloseEvent& event )
 {
     Hide();
 }

diff --git a/modules/gui/wxwindows/video.cpp b/modules/gui/wxwindows/video.cpp
index d054ebf63f4f8f0b83781f78c9451f73a28b3750..0eef319afef8db2094fa2532db96fc6679a2b423 100644 (file)
--- a/modules/gui/wxwindows/video.cpp
+++ b/modules/gui/wxwindows/video.cpp
@@ -69,8 +69,8 @@ private:
 
     wxWindow *p_child_window;
 
-    void UpdateSize( wxSizeEvent & );
-    void UpdateHide( wxSizeEvent & );
+    void UpdateSize( wxEvent & );
+    void UpdateHide( wxEvent & );
     void OnControlEvent( wxCommandEvent & );
 
     DECLARE_EVENT_TABLE();
@@ -235,8 +235,9 @@ void VideoWindow::ReleaseWindow( void *p_window )
     vlc_mutex_unlock( &lock );
 }
 
-void VideoWindow::UpdateSize( wxSizeEvent &event )
+void VideoWindow::UpdateSize( wxEvent &_event )
 {
+    wxSizeEvent * event = (wxSizeEvent*)(&_event);
     if( !b_shown )
     {
         p_intf->p_sys->p_video_sizer->Show( this, TRUE );
@@ -244,14 +245,15 @@ void VideoWindow::UpdateSize( wxSizeEvent &event )
         SetFocus();
         b_shown = VLC_TRUE;
     }
-    p_intf->p_sys->p_video_sizer->SetMinSize( event.GetSize() );
+    p_intf->p_sys->p_video_sizer->SetMinSize( event->GetSize() );
 
     wxCommandEvent intf_event( wxEVT_INTF, 0 );
     p_parent->AddPendingEvent( intf_event );
 }
 
-void VideoWindow::UpdateHide( wxSizeEvent &event )
+void VideoWindow::UpdateHide( wxEvent &_event )
 {
+    wxSizeEvent * event = (wxSizeEvent*)(&_event);
     if( b_shown )
     {
         p_intf->p_sys->p_video_sizer->Show( this, FALSE );
@@ -261,7 +263,7 @@ void VideoWindow::UpdateHide( wxSizeEvent &event )
         SetSize(0,0);
         Show();
     }
-    p_intf->p_sys->p_video_sizer->SetMinSize( event.GetSize() );
+    p_intf->p_sys->p_video_sizer->SetMinSize( event->GetSize() );
 
     wxCommandEvent intf_event( wxEVT_INTF, 0 );
     p_parent->AddPendingEvent( intf_event );

diff --git a/modules/gui/wxwindows/wxwindows.h b/modules/gui/wxwindows/wxwindows.h
index ec475ecf3c71ab465222e522b54045488599fc02..a728c1e42d6ac79fde95f33e8c60e760e4b77970 100644 (file)
--- a/modules/gui/wxwindows/wxwindows.h
+++ b/modules/gui/wxwindows/wxwindows.h
@@ -998,7 +998,7 @@ public:
     vlc_bool_t b_need_update;
 
 private:
-    void OnClose( wxCommandEvent& event );
+    void OnClose( wxCloseEvent& event );
 
     DECLARE_EVENT_TABLE();