Commit ab3e1260 authored by gbazin's avatar gbazin
Browse files

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

parent 49abe975
...@@ -372,7 +372,11 @@ void Interface::CreateOurMenuBar() ...@@ -372,7 +372,11 @@ void Interface::CreateOurMenuBar()
#if defined(__WXGTK__) #if defined(__WXGTK__)
22 /* approximate margin */; 22 /* approximate margin */;
#else #else
#if (wxMAJOR_VERSION <= 2) && (wxMINOR_VERSION <= 5) && (wxRELEASE_NUMBER < 3)
4 /* approximate margin */; 4 /* approximate margin */;
#else
15 /* approximate margin */;
#endif
#endif #endif
} }
frame_sizer->SetMinSize( i_size, -1 ); frame_sizer->SetMinSize( i_size, -1 );
......
...@@ -705,6 +705,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf, ...@@ -705,6 +705,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
b_advanced = VLC_TRUE; b_advanced = VLC_TRUE;
SetAutoLayout( TRUE ); SetAutoLayout( TRUE );
Hide();
wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
...@@ -814,6 +815,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf, ...@@ -814,6 +815,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
} }
sizer->Layout(); sizer->Layout();
SetSizer( sizer ); SetSizer( sizer );
Show();
} }
void PrefsPanel::ApplyChanges() void PrefsPanel::ApplyChanges()
......
...@@ -39,11 +39,14 @@ ...@@ -39,11 +39,14 @@
#include "wxwindows.h" #include "wxwindows.h"
/* Temporary hack */ /* Temporary hack */
#if defined(WIN32) && defined(_WX_INIT_H_) #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 */ /* Hack to detect wxWindows 2.5 which has a different wxEntry() prototype */
extern int wxEntry( HINSTANCE hInstance, HINSTANCE hPrevInstance = NULL, extern int wxEntry( HINSTANCE hInstance, HINSTANCE hPrevInstance = NULL,
char *pCmdLine = NULL, int nCmdShow = SW_NORMAL ); char *pCmdLine = NULL, int nCmdShow = SW_NORMAL );
#endif #endif
#endif
#ifdef SYS_DARWIN #ifdef SYS_DARWIN
int wxEntry( int argc, char *argv[] , bool enterLoop = TRUE ); int wxEntry( int argc, char *argv[] , bool enterLoop = TRUE );
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment