From d1f113088a818d64f81a0de6bbaff245e1b9aa54 Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Thu, 10 Nov 2005 18:43:42 +0000 Subject: [PATCH] * modules/gui/wxwidgets: wx backward compatibility fixes by Daniel Stranger (vlc at schmaller dot de). --- modules/gui/wxwidgets/extrapanel.cpp | 4 ++-- modules/gui/wxwidgets/interface.cpp | 4 ++++ modules/gui/wxwidgets/open.cpp | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/gui/wxwidgets/extrapanel.cpp b/modules/gui/wxwidgets/extrapanel.cpp index 84fb202c58..36e7a4d2d7 100644 --- 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 29961f520a..f53706f59d 100644 --- a/modules/gui/wxwidgets/interface.cpp +++ b/modules/gui/wxwidgets/interface.cpp @@ -339,7 +339,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" ) ) ) diff --git a/modules/gui/wxwidgets/open.cpp b/modules/gui/wxwidgets/open.cpp index 42adea124e..c2c2bc0ea8 100644 --- a/modules/gui/wxwidgets/open.cpp +++ b/modules/gui/wxwidgets/open.cpp @@ -501,7 +501,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 @@ -577,7 +577,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 ); -- 2.39.2