* modules/gui/wxwidgets: wx backward compatibility fixes by Daniel Stranger (vlc...

diff --git a/modules/gui/wxwidgets/dialogs/open.cpp b/modules/gui/wxwidgets/dialogs/open.cpp
index 6a75bba7a28b0933f6e71318421c8243247abcde..22d8bc866473a4954d76e3fa241b8ae062556575 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/open.cpp
+++ b/modules/gui/wxwidgets/dialogs/open.cpp
@@ -495,7 +495,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
     /* Create notebook */
     notebook = new wxNotebook( panel, Notebook_Event );
 
-#if (!wxCHECK_VERSION(2,5,0))
+#if (!wxCHECK_VERSION(2,5,2))
     wxNotebookSizer *notebook_sizer = new wxNotebookSizer( notebook );
 #endif
 
@@ -571,7 +571,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
     wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
     panel_sizer->Add( mrl_sizer_sizer, 0, wxEXPAND, 5 );
     panel_sizer->Add( label, 0, wxEXPAND | wxALL, 5 );
-#if (!wxCHECK_VERSION(2,5,0))
+#if (!wxCHECK_VERSION(2,5,2))
     panel_sizer->Add( notebook_sizer, 1, wxEXPAND | wxALL, 5 );
 #else
     panel_sizer->Add( notebook, 1, wxEXPAND | wxALL, 5 );

diff --git a/modules/gui/wxwidgets/extrapanel.cpp b/modules/gui/wxwidgets/extrapanel.cpp
index 232a1384bdf4ddb2f65e8d196fee6aa14bd42e38..3c1429632c2cbb4650be101dd4f35da839363a0f 100644 (file)
--- a/modules/gui/wxwidgets/extrapanel.cpp
+++ b/modules/gui/wxwidgets/extrapanel.cpp
@@ -171,7 +171,7 @@ ExtraPanel::ExtraPanel( intf_thread_t *_p_intf, wxWindow *_p_parent ):
 
     notebook = new wxNotebook( this, Notebook_Event );
 
-#if (!wxCHECK_VERSION(2,5,0))
+#if (!wxCHECK_VERSION(2,5,2))
     wxNotebookSizer *notebook_sizer = new wxNotebookSizer( notebook );
 #endif
 
@@ -179,7 +179,7 @@ ExtraPanel::ExtraPanel( intf_thread_t *_p_intf, wxWindow *_p_parent ):
     notebook->AddPage( EqzPanel( notebook ), wxU(_("Equalizer")) );
     notebook->AddPage( AudioPanel( notebook ), wxU(_("Audio")) );
 
-#if (!wxCHECK_VERSION(2,5,0))
+#if (!wxCHECK_VERSION(2,5,2))
     extra_sizer->Add( notebook_sizer, 1, wxEXPAND, 0 );
 #else
     extra_sizer->Add( notebook, 1, wxEXPAND, 0 );

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index 37356263e4b567daa27591cc8b1e7450feaad231..3318f175cb02a6df2aff95e85e9e5cb8c9d206b5 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -343,7 +343,11 @@ Interface::Interface( intf_thread_t *_p_intf, long style ):
         s2 = video_window->GetSize();
         s.SetHeight( s.GetHeight() - s2.GetHeight() );
     }
+#if (wxCHECK_VERSION(2,5,4))
     SetMinSize( s );
+#else
+    frame_sizer->SetMinSize( s );
+#endif
 
     /* Show extended GUI if requested */
     if( ( b_extra = config_GetInt( p_intf, "wx-extended" ) ) )
@@ -745,7 +749,6 @@ void Interface::SetupHotkeys()
 
 void Interface::HideSlider( bool layout )
 {
-        fprintf( stderr, "Hiding slider\n");
     ShowSlider( false, layout );
 }