* modules/gui/wxwindows/*: win32 fixes with new wxWidgets.

modules/gui/wxwindows/interface.cpp

@@ -372,7 +372,11 @@ void Interface::CreateOurMenuBar()
 #if defined(__WXGTK__)
             22 /* approximate margin */;
 #else
+#if (wxMAJOR_VERSION <= 2) && (wxMINOR_VERSION <= 5) && (wxRELEASE_NUMBER < 3)
             4 /* approximate margin */;
+#else
+            15 /* approximate margin */;
+#endif
 #endif
     }
     frame_sizer->SetMinSize( i_size, -1 );

modules/gui/wxwindows/preferences.cpp

@@ -705,6 +705,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
 
     b_advanced = VLC_TRUE;
     SetAutoLayout( TRUE );
+    Hide();
 
     wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
 
@@ -814,6 +815,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
     }
     sizer->Layout();
     SetSizer( sizer );
+    Show();
 }
 
 void PrefsPanel::ApplyChanges()

modules/gui/wxwindows/wxwindows.cpp

@@ -40,10 +40,13 @@
 
 /* Temporary hack */
 #if defined(WIN32) && defined(_WX_INIT_H_) 
+#if (wxMAJOR_VERSION <= 2) && (wxMINOR_VERSION <= 5) && (wxRELEASE_NUMBER < 3)
 /* Hack to detect wxWindows 2.5 which has a different wxEntry() prototype */
 extern int wxEntry( HINSTANCE hInstance, HINSTANCE hPrevInstance = NULL,
                     char *pCmdLine = NULL, int nCmdShow = SW_NORMAL );
 #endif
+#endif
+
 #ifdef SYS_DARWIN
 int wxEntry( int argc, char *argv[] , bool enterLoop = TRUE );
 #endif