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

* modules/gui/wxwidgets: wx backward compatibility fixes by Daniel Stranger (vlc at schmaller dot de).

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 );

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 );

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 );
 }