all: reworked gui layout of dialog boxes to get rid of the dark gray background colou...

diff --git a/modules/gui/wxwidgets/dialogs/fileinfo.cpp b/modules/gui/wxwidgets/dialogs/fileinfo.cpp
index a1f63279a0fc2ad845f47832e646a7bba23365ca..6a3642d7860e4e58f28e57b5cf11f747ba888c3c 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/fileinfo.cpp
+++ b/modules/gui/wxwidgets/dialogs/fileinfo.cpp
@@ -63,9 +63,14 @@ FileInfo::FileInfo( intf_thread_t *_p_intf, wxWindow *p_parent ):
     SetIcon( *p_intf->p_sys->p_icon );
     SetAutoLayout( TRUE );
 
+    /* Create a panel to put everything in */
+    wxPanel *panel = new wxPanel( this, -1 );
+    panel->SetAutoLayout( TRUE );
+
+    wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
     panel_sizer = new wxBoxSizer( wxVERTICAL );
 
-    wxNotebook *notebook = new wxNotebook( this, -1 );
+    wxNotebook *notebook = new wxNotebook( panel, -1 );
 #if (!wxCHECK_VERSION(2,5,2))
         wxNotebookSizer *notebook_sizer = new wxNotebookSizer( notebook );
 #endif
@@ -85,11 +90,14 @@ FileInfo::FileInfo( intf_thread_t *_p_intf, wxWindow *p_parent ):
     panel_sizer->Add( notebook, 1, wxEXPAND | wxALL, 5 );
 #endif
 
-    panel_sizer->Add( new wxButton( this, wxID_CLOSE ) ,
+    panel_sizer->Add( new wxButton( panel, wxID_CLOSE ) ,
                       0, wxALL|wxALIGN_RIGHT, 5 );
 
     panel_sizer->Layout();
-    SetSizerAndFit( panel_sizer );
+    panel->SetSizerAndFit( panel_sizer );
+    main_sizer->Add( panel, 1, wxGROW, 0 );
+    main_sizer->Layout();
+    SetSizerAndFit( main_sizer );
 
     if( p_playlist )
     {

diff --git a/modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp b/modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp
index 427e29929da11ce552c02cb5afc4abb93baaf942..9d2676e272c5fc2a3099bbdc8423a51f2e73f6ed 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp
+++ b/modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp
@@ -528,7 +528,11 @@ VLMFrame::VLMFrame( intf_thread_t *_p_intf, wxWindow *_p_parent ) :
     wxBoxSizer *main_sizer = new wxBoxSizer( wxHORIZONTAL );
     vlm_panel = new VLMPanel( _p_intf, this );
 
+#if defined(WIN32)
+    main_sizer->Add( vlm_panel, 1, wxGROW, 0 );
+#else
     main_sizer->Add( vlm_panel, 1, wxEXPAND | wxALL, 5 );
+#endif
     main_sizer->Layout();
     SetSizerAndFit( main_sizer );
 }