Commit 3b39f995 authored by gbazin's avatar gbazin
Browse files

* modules/gui/wxwindows/interface.cpp: volume control has a fixed width of 20 pixels.

  Fixed sizer problem on win32 with wxWin cvs.
parent 845b36f0
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* interface.cpp : wxWindows plugin for vlc * interface.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001, 2003 VideoLAN * Copyright (C) 2000-2001, 2003 VideoLAN
* $Id: interface.cpp,v 1.77 2003/12/11 05:12:37 rocky Exp $ * $Id: interface.cpp,v 1.78 2003/12/14 15:42:19 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -226,7 +226,7 @@ Interface::Interface( intf_thread_t *_p_intf ): ...@@ -226,7 +226,7 @@ Interface::Interface( intf_thread_t *_p_intf ):
wxWindow *p_dummy = new wxWindow( this, 0, wxDefaultPosition, wxWindow *p_dummy = new wxWindow( this, 0, wxDefaultPosition,
wxSize(0,0) ); wxSize(0,0) );
p_dummy->SetFocus(); p_dummy->SetFocus();
frame_sizer->Add( p_dummy ); frame_sizer->Add( p_dummy, 0, wxEXPAND );
/* Creation of the menu bar */ /* Creation of the menu bar */
CreateOurMenuBar(); CreateOurMenuBar();
...@@ -256,7 +256,6 @@ Interface::Interface( intf_thread_t *_p_intf ): ...@@ -256,7 +256,6 @@ Interface::Interface( intf_thread_t *_p_intf ):
SetBackgroundColour( slider_frame->GetBackgroundColour() ); SetBackgroundColour( slider_frame->GetBackgroundColour() );
/* Layout everything */ /* Layout everything */
SetAutoLayout( TRUE );
frame_sizer->Layout(); frame_sizer->Layout();
frame_sizer->Fit(this); frame_sizer->Fit(this);
...@@ -396,8 +395,8 @@ void Interface::CreateOurToolBar() ...@@ -396,8 +395,8 @@ void Interface::CreateOurToolBar()
wxLogNull LogDummy; /* Hack to suppress annoying log message on the win32 wxLogNull LogDummy; /* Hack to suppress annoying log message on the win32
* version because we don't include wx.rc */ * version because we don't include wx.rc */
wxToolBar *toolbar = CreateToolBar( wxToolBar *toolbar =
wxTB_HORIZONTAL | wxTB_FLAT | wxTB_DOCKABLE ); CreateToolBar( wxTB_HORIZONTAL | wxTB_FLAT | wxTB_DOCKABLE );
toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) ); toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) );
...@@ -405,23 +404,19 @@ void Interface::CreateOurToolBar() ...@@ -405,23 +404,19 @@ void Interface::CreateOurToolBar()
wxBitmap( file_xpm ), wxU(_(HELP_SIMPLE)) ); wxBitmap( file_xpm ), wxU(_(HELP_SIMPLE)) );
toolbar->AddSeparator(); toolbar->AddSeparator();
toolbar->AddTool( OpenFile_Event, wxU(_("File")), wxBitmap( file_xpm ), toolbar->AddTool( OpenFile_Event, wxU(_("File")), wxBitmap( file_xpm ),
wxU(_(HELP_FILE)) ); wxU(_(HELP_FILE)) );
toolbar->AddTool( OpenDisc_Event, wxU(_("Disc")), wxBitmap( disc_xpm ), toolbar->AddTool( OpenDisc_Event, wxU(_("Disc")), wxBitmap( disc_xpm ),
wxU(_(HELP_DISC)) ); wxU(_(HELP_DISC)) );
toolbar->AddTool( OpenNet_Event, wxU(_("Net")), wxBitmap( net_xpm ), toolbar->AddTool( OpenNet_Event, wxU(_("Net")), wxBitmap( net_xpm ),
wxU(_(HELP_NET)) ); wxU(_(HELP_NET)) );
#if 0
toolbar->AddTool( OpenSat_Event, wxU(_("Sat")), wxBitmap( sat_xpm ),
wxU(_(HELP_SAT)) );
#endif
toolbar->AddSeparator(); toolbar->AddSeparator();
toolbar->AddTool( StopStream_Event, wxU(_("Stop")), wxBitmap( stop_xpm ), toolbar->AddTool( StopStream_Event, wxU(_("Stop")), wxBitmap( stop_xpm ),
wxU(_(HELP_STOP)) ); wxU(_(HELP_STOP)) );
toolbar->AddTool( PlayStream_Event, wxU(_("Play")), wxBitmap( play_xpm ), toolbar->AddTool( PlayStream_Event, wxU(_("Play")), wxBitmap( play_xpm ),
wxU(_(HELP_PLAY)) ); wxU(_(HELP_PLAY)) );
toolbar->AddSeparator(); toolbar->AddSeparator();
toolbar->AddTool( Playlist_Event, wxU(_("Playlist")), toolbar->AddTool( Playlist_Event, wxU(_("Playlist")),
wxBitmap( playlist_xpm ), wxU(_(HELP_PLO)) ); wxBitmap( playlist_xpm ), wxU(_(HELP_PLO)) );
...@@ -439,14 +434,15 @@ void Interface::CreateOurToolBar() ...@@ -439,14 +434,15 @@ void Interface::CreateOurToolBar()
/* Place the toolbar in a sizer, so we can calculate the width of the /* Place the toolbar in a sizer, so we can calculate the width of the
* toolbar and set this as the minimum for the main frame size. */ * toolbar and set this as the minimum for the main frame size. */
wxBoxSizer *toolbar_sizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer *toolbar_sizer = new wxBoxSizer( wxHORIZONTAL );
toolbar_sizer->Add( toolbar, 0, 0, 0 ); toolbar_sizer->Add( toolbar, 1, 0, 0 );
toolbar_sizer->Layout(); toolbar_sizer->Layout();
#ifndef WIN32 #ifndef WIN32
frame_sizer->SetMinSize( toolbar_sizer->GetMinSize().GetWidth(), -1 ); frame_sizer->SetMinSize( toolbar_sizer->GetMinSize().GetWidth(), -1 );
#else #else
frame_sizer->SetMinSize( toolbar->GetToolSize().GetWidth() * frame_sizer->SetMinSize( toolbar->GetToolSize().GetWidth() * 11 +
toolbar->GetToolSeparation() * 3 +
(toolbar->GetMargins().GetWidth() + 2) *
toolbar->GetToolsCount(), -1 ); toolbar->GetToolsCount(), -1 );
#endif #endif
...@@ -1331,7 +1327,7 @@ bool DragAndDrop::OnDropFiles( wxCoord, wxCoord, ...@@ -1331,7 +1327,7 @@ bool DragAndDrop::OnDropFiles( wxCoord, wxCoord,
* Definition of wxVolCtrl class. * Definition of wxVolCtrl class.
*****************************************************************************/ *****************************************************************************/
wxVolCtrl::wxVolCtrl( intf_thread_t *_p_intf, wxWindow* parent, wxWindowID id ) wxVolCtrl::wxVolCtrl( intf_thread_t *_p_intf, wxWindow* parent, wxWindowID id )
: wxGauge( parent, id, 200, wxDefaultPosition, wxDefaultSize, : wxGauge( parent, id, 200, wxDefaultPosition, wxSize( 20, -1 ),
wxGA_VERTICAL | wxGA_SMOOTH ) wxGA_VERTICAL | wxGA_SMOOTH )
{ {
p_intf = _p_intf; p_intf = _p_intf;
......
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