* modules/gui/wxwindows: MSVC fixes for the wxwindows interface plugin. Patch by...

diff --git a/modules/gui/wxwindows/bookmarks.cpp b/modules/gui/wxwindows/bookmarks.cpp
index d1ccb003a8db3ed0351a05463b6fa1c9119d23d6..a5a86502bc128fc4d5789aa8b8141550d801a37e 100644 (file)
--- a/modules/gui/wxwindows/bookmarks.cpp
+++ b/modules/gui/wxwindows/bookmarks.cpp
@@ -296,7 +296,7 @@ BookmarksDialog::~BookmarksDialog()
  *****************************************************************************/
 wxWindow *BookmarksDialog( intf_thread_t *p_intf, wxWindow *p_parent )
 {
-    return new BookmarksDialog::BookmarksDialog( p_intf, p_parent );
+    return new class BookmarksDialog( p_intf, p_parent );
 }
 
 void BookmarksDialog::Update()
@@ -545,8 +545,7 @@ void BookmarksDialog::OnUpdate( wxCommandEvent &event )
 static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
                             vlc_value_t oval, vlc_value_t nval, void *param )
 {
-    BookmarksDialog::BookmarksDialog *p_dialog =
-        (BookmarksDialog::BookmarksDialog *)param;
+    class BookmarksDialog *p_dialog = (class BookmarksDialog *)param;
 
     wxCommandEvent bookmarks_event( wxEVT_BOOKMARKS, 0 );
     p_dialog->AddPendingEvent( bookmarks_event );

diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp
index d37212e3817db70d932dc0d85dfae8eb9b56c02d..c7e498996a4f3b094de0441f7beb3c471e6643e7 100644 (file)
--- a/modules/gui/wxwindows/interface.cpp
+++ b/modules/gui/wxwindows/interface.cpp
@@ -251,7 +251,7 @@ Interface::Interface( intf_thread_t *_p_intf ):
     /* Video window */
     if( config_GetInt( p_intf, "wxwin-embed" ) )
     {
-        VideoWindow( p_intf, this );
+        CreateVideoWindow( p_intf, this );
         frame_sizer->Add( p_intf->p_sys->p_video_sizer, 1, wxEXPAND , 0 );
     }
 
@@ -606,7 +606,7 @@ void Interface::SetupHotkeys()
     p_intf->p_sys->i_first_hotkey_event = wxID_HIGHEST + 7000;
     p_intf->p_sys->i_hotkeys = i_hotkeys;
 
-    wxAcceleratorEntry p_entries[i_hotkeys];
+    wxAcceleratorEntry *p_entries = new wxAcceleratorEntry[i_hotkeys];
 
     /* Setup the hotkeys as accelerators */
     for( int i = 0; i < i_hotkeys; i++ )
@@ -633,6 +633,8 @@ void Interface::SetupHotkeys()
         SetAcceleratorTable( accel );
         msg_Dbg( p_intf, "accelerator table loaded" );
     }
+
+    delete [] p_entries;
 }
 
 /*****************************************************************************

diff --git a/modules/gui/wxwindows/video.cpp b/modules/gui/wxwindows/video.cpp
index 8d44d0ce0bb8428945b14a61ec3b4d086274c81b..d054ebf63f4f8f0b83781f78c9451f73a28b3750 100644 (file)
--- a/modules/gui/wxwindows/video.cpp
+++ b/modules/gui/wxwindows/video.cpp
@@ -88,9 +88,9 @@ END_EVENT_TABLE()
 /*****************************************************************************
  * Public methods.
  *****************************************************************************/
-wxWindow *VideoWindow( intf_thread_t *p_intf, wxWindow *p_parent )
+wxWindow *CreateVideoWindow( intf_thread_t *p_intf, wxWindow *p_parent )
 {
-    return new VideoWindow::VideoWindow( p_intf, p_parent );
+    return new VideoWindow( p_intf, p_parent );
 }
 
 /*****************************************************************************

diff --git a/modules/gui/wxwindows/wxwindows.h b/modules/gui/wxwindows/wxwindows.h
index eae0666846f093be04bda9d77111a6449c4ce8f8..e0906aad423bda5775277a438538b0e1e58b7414 100644 (file)
--- a/modules/gui/wxwindows/wxwindows.h
+++ b/modules/gui/wxwindows/wxwindows.h
@@ -148,7 +148,7 @@ struct intf_sys_t
  * Prototypes
  *****************************************************************************/
 wxArrayString SeparateEntries( wxString );
-wxWindow *VideoWindow( intf_thread_t *p_intf, wxWindow *p_parent );
+wxWindow *CreateVideoWindow( intf_thread_t *p_intf, wxWindow *p_parent );
 wxWindow *BookmarksDialog( intf_thread_t *p_intf, wxWindow *p_parent );
 wxWindow *CreateDialogsProvider( intf_thread_t *p_intf, wxWindow *p_parent );