ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup from earlier commit -- forgot to remove some obsoleted sizer code. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2214 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-11-18 08:14:40 +00:00
parent 2709f3c29c
commit 98605ea279
6 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/gui/Panels/BiosSelectorPanel.cpp
View File

@ -91,8 +91,6 @@ Panels::BiosSelectorPanel::BiosSelectorPanel( wxWindow* parent, int idealWidth )
sizer.Add( &m_ComboBox, pxSizerFlags::StdExpand() ); sizer.Add( &m_ComboBox, pxSizerFlags::StdExpand() );
sizer.AddSpacer( 6 ); sizer.AddSpacer( 6 );
sizer.Add( &m_FolderPicker, pxSizerFlags::StdExpand() ); sizer.Add( &m_FolderPicker, pxSizerFlags::StdExpand() );
SetSizer( &sizer );
} }
Panels::BiosSelectorPanel::~BiosSelectorPanel() throw () Panels::BiosSelectorPanel::~BiosSelectorPanel() throw ()

1
pcsx2/gui/Panels/DirPickerPanel.cpp
View File

@ -122,7 +122,6 @@ Panels::DirPickerPanel::DirPickerPanel( wxWindow* parent, FoldersEnum_t folderid
Panels::DirPickerPanel& Panels::DirPickerPanel::SetStaticDesc( const wxString& msg ) Panels::DirPickerPanel& Panels::DirPickerPanel::SetStaticDesc( const wxString& msg )
{ {
InsertStaticTextAt( this, *GetSizer(), 0, msg ); InsertStaticTextAt( this, *GetSizer(), 0, msg );
//SetSizer( GetSizer(), false );
return *this; return *this;
} }

1
pcsx2/gui/Panels/PathsPanel.cpp
View File

@ -78,6 +78,5 @@ Panels::StandardPathsPanel::StandardPathsPanel( wxWindow* parent ) :
) ); ) );
s_main.AddSpacer( 5 ); s_main.AddSpacer( 5 );
SetSizer( &s_main );
} }

13
pcsx2/gui/Panels/PluginSelectorPanel.cpp
View File

@ -212,8 +212,6 @@ Panels::PluginSelectorPanel::ComboBoxPanel::ComboBoxPanel( PluginSelectorPanel*
s_main.Add( &s_plugin, wxSizerFlags().Expand() ); s_main.Add( &s_plugin, wxSizerFlags().Expand() );
s_main.AddSpacer( 6 ); s_main.AddSpacer( 6 );
s_main.Add( &m_FolderPicker, pxSizerFlags::StdExpand() ); s_main.Add( &m_FolderPicker, pxSizerFlags::StdExpand() );
SetSizer( &s_main );
} }
void Panels::PluginSelectorPanel::ComboBoxPanel::Reset() void Panels::PluginSelectorPanel::ComboBoxPanel::Reset()
@ -440,6 +438,7 @@ void Panels::PluginSelectorPanel::OnConfigure_Clicked( wxCommandEvent& evt )
int sel = m_ComponentBoxes->Get(pid).GetSelection(); int sel = m_ComponentBoxes->Get(pid).GetSelection();
if( sel == wxNOT_FOUND ) return; if( sel == wxNOT_FOUND ) return;
wxDynamicLibrary dynlib( (*m_FileList)[(int)m_ComponentBoxes->Get(pid).GetClientData(sel)] ); wxDynamicLibrary dynlib( (*m_FileList)[(int)m_ComponentBoxes->Get(pid).GetClientData(sel)] );
if( PluginConfigureFnptr configfunc = (PluginConfigureFnptr)dynlib.GetSymbol( tbl_PluginInfo[pid].GetShortname() + L"configure" ) ) if( PluginConfigureFnptr configfunc = (PluginConfigureFnptr)dynlib.GetSymbol( tbl_PluginInfo[pid].GetShortname() + L"configure" ) )
{ {
bool resume = CoreThread.Suspend(); bool resume = CoreThread.Suspend();
@ -545,11 +544,11 @@ void Panels::PluginSelectorPanel::OnProgress( wxCommandEvent& evt )
// EnumThread method implementations // EnumThread method implementations
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
Panels::PluginSelectorPanel::EnumThread::EnumThread( PluginSelectorPanel& master ) : Panels::PluginSelectorPanel::EnumThread::EnumThread( PluginSelectorPanel& master )
PersistentThread() : PersistentThread()
, Results( master.FileCount(), L"PluginSelectorResults" ) , Results( master.FileCount(), L"PluginSelectorResults" )
, m_master( master ) , m_master( master )
, m_hourglass( Cursor_KindaBusy ) , m_hourglass( Cursor_KindaBusy )
{ {
Results.MatchLengthToAllocatedSize(); Results.MatchLengthToAllocatedSize();
} }

1
pcsx2/gui/Panels/SpeedhacksPanel.cpp
View File

@ -252,7 +252,6 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent ) :
heading->AddTo( mainSizer ); heading->AddTo( mainSizer );
mainSizer.Add( s_table, wxSizerFlags().Expand() ); mainSizer.Add( s_table, wxSizerFlags().Expand() );
mainSizer.Add( &DefEnableSizer, wxSizerFlags().Expand() ); mainSizer.Add( &DefEnableSizer, wxSizerFlags().Expand() );
SetSizer( &mainSizer );
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------

3
pcsx2/gui/Panels/VideoPanel.cpp
View File

@ -190,8 +190,7 @@ Panels::GSWindowSettingsPanel::GSWindowSettingsPanel( wxWindow* parent )
s_winsize.Add( &s_customsize, StdSpace().Border( wxLEFT | wxRIGHT | wxBOTTOM) ); s_winsize.Add( &s_customsize, StdSpace().Border( wxLEFT | wxRIGHT | wxBOTTOM) );
wxBoxSizer& s_main( *new wxBoxSizer( wxVERTICAL ) ); wxSizer& s_main( *GetSizer() );
SetSizer( &s_main );
s_main.Add( &s_winsize, StdSpace() ); s_main.Add( &s_winsize, StdSpace() );