Commit 43c3dc3f authored by Gildas Bazin's avatar Gildas Bazin

* modules/gui/wxwidgets: wxwidgets 2.4.2 compilation fixes as suggested by...

* modules/gui/wxwidgets: wxwidgets 2.4.2 compilation fixes as suggested by Charlie Ledogar (charlie10 at gmail dot com)
parent 6e6164d0
......@@ -22,6 +22,7 @@
*****************************************************************************/
#include <vector>
#include <wx/spinctrl.h>
class ConfigControl: public wxPanel
{
......
......@@ -2,7 +2,7 @@
* streamout.hpp: Stream output dialog
*****************************************************************************
* Copyright (C) 1999-2005 the VideoLAN team
* $Id: wxwidgets.h 12670 2005-09-25 11:16:31Z zorglub $
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
*
......@@ -25,6 +25,7 @@
#define _WXVLC_STREAMOUT_H_
#include "wxwidgets.hpp"
#include <wx/spinctrl.h>
namespace wxvlc
{
......
......@@ -2,7 +2,7 @@
* subtitles.hpp: private wxWindows interface description
*****************************************************************************
* Copyright (C) 1999-2005 the VideoLAN team
* $Id: wxwidgets.h 12502 2005-09-09 19:38:01Z gbazin $
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
*
......@@ -25,7 +25,7 @@
#define _WXVLC_SUBTITLES_H_
#include "wxwidgets.hpp"
#include <wx/spinctrl.h>
namespace wxvlc
{
......
......@@ -280,11 +280,11 @@ Interface::Interface( intf_thread_t *_p_intf, long style ):
statusbar->SetStatusText( wxString::Format(wxT("x%.2f"), 1.0), 1 );
/* Get minimum window size to prevent user from glitching it */
splitter->SetSizeHints( wxSize(-1,0) );
splitter->SetSizeHints( -1, 0 );
panel_sizer->Layout(); panel_sizer->Fit( main_panel );
main_sizer->Layout(); main_sizer->Fit( this );
main_min_size = GetSize();
splitter->SetSizeHints( wxSize(-1,-1) );
splitter->SetSizeHints( -1, -1 );
/* Video window */
video_window = 0;
......@@ -299,10 +299,10 @@ Interface::Interface( intf_thread_t *_p_intf, long style ):
panel_sizer->Add( input_manager, 0, wxEXPAND , 0 );
/* Layout everything */
splitter->SetSizeHints( wxSize(-1,0) );
splitter->SetSizeHints( -1, 0 );
panel_sizer->Layout(); panel_sizer->Fit( main_panel );
main_sizer->Layout(); main_sizer->Fit( this );
splitter->SetSizeHints( wxSize(-1,-1) );
splitter->SetSizeHints( -1, -1 );
#if wxUSE_DRAG_AND_DROP
/* Associate drop targets with the main interface */
......@@ -686,7 +686,7 @@ void Interface::SetIntfMinSize()
ms.SetWidth( playlist_min_size.GetWidth() );
}
SetSizeHints( ms );
SetSizeHints( ms.GetWidth(), ms.GetHeight() );
}
/*****************************************************************************
......
......@@ -123,7 +123,7 @@ PlaylistManager::PlaylistManager( intf_thread_t *_p_intf, wxWindow *p_parent ):
sizer = new wxBoxSizer( wxHORIZONTAL );
SetSizer( sizer );
sizer->Add( treectrl, 1, wxEXPAND );
treectrl->SetSizeHints( wxSize(500, 150) );
treectrl->SetSizeHints( 500, 150 );
sizer->Layout();
sizer->Fit( this );
......
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