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

diff --git a/modules/gui/wxwidgets/dialogs/preferences_widgets.h b/modules/gui/wxwidgets/dialogs/preferences_widgets.h
index 2f10e2ff53daf5167caa2b46dccad79666fdb70f..b7fe807e6fadf6fc256efa298e27be225be0ea4c 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/preferences_widgets.h
+++ b/modules/gui/wxwidgets/dialogs/preferences_widgets.h
@@ -22,6 +22,7 @@
  *****************************************************************************/
 
 #include <vector>
+#include <wx/spinctrl.h>
 
 class ConfigControl: public wxPanel
 {

diff --git a/modules/gui/wxwidgets/dialogs/streamout.hpp b/modules/gui/wxwidgets/dialogs/streamout.hpp
index a4098c165eccabe8d6e1d1658d9ba95b112c8e34..0f85091504d59a2cd660b2d47ac211112ec5d2a4 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/streamout.hpp
+++ b/modules/gui/wxwidgets/dialogs/streamout.hpp
@@ -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
 {

diff --git a/modules/gui/wxwidgets/dialogs/subtitles.hpp b/modules/gui/wxwidgets/dialogs/subtitles.hpp
index 87899e61ed1b7a16b8577f1dffae41194620bd97..541a351a818da8c7bf558b7caead0b01ff26da9e 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/subtitles.hpp
+++ b/modules/gui/wxwidgets/dialogs/subtitles.hpp
@@ -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
 {

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index 00b56927a0c274eae7f58f94b30a618f0f36a429..dcc36e67c781f879d5b81aeffa3aa3bfd865f308 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -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() );
 }
 
 /*****************************************************************************

diff --git a/modules/gui/wxwidgets/playlist_manager.cpp b/modules/gui/wxwidgets/playlist_manager.cpp
index 0d0238198209f377bcd633667303538de59bd96e..816448c5c79ef06337ce13797b09a52d20b860dd 100644 (file)
--- a/modules/gui/wxwidgets/playlist_manager.cpp
+++ b/modules/gui/wxwidgets/playlist_manager.cpp
@@ -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 );