preserve-emulation/pcsx2
1
0 Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-11-11 00:30:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Speedhacks master toggle saves now.

Browse Source 
DevStuff:
 * Added a handful of operator+= overloads for working with wxSizers -- moderately reduces code clutter. :)
 * Commented some of the wxHelpers classes (pxStaticText, wxPanelWithHelpers, etc).

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2221 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine committed 2009-11-19 05:08:24 +00:00
1 parent 787d39c8bc
commit 4ba3fd07dc
22 files changed
+410 -267
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

common/src/Utilities/pxStaticText.cpp
+4 -12
View File
@@ -19,8 +19,6 @@
// --------------------------------------------------------------------------------------
// pxStaticText Implementations
// --------------------------------------------------------------------------------------
// Implementation Notes:
// * No reason to ever have AutoResize enabled, quite frankly. It just causes layout and centering problems.
pxStaticText::pxStaticText( wxWindow* parent, const wxString& label, int style )
: wxStaticText( parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, style )
@@ -63,15 +61,15 @@ pxStaticText& pxStaticText::SetToolTip( const wxString& tip )
return *this;
}
void pxStaticText::AddTo( wxSizer& sizer )
void pxStaticText::AddTo( wxSizer& sizer, wxSizerFlags flags )
{
sizer.Add( this, pxSizerFlags::StdSpace().Align( m_alignflags ) );
sizer.Add( this, flags.Align( m_alignflags ) );
_setLabel();
}
void pxStaticText::InsertAt( wxSizer& sizer, int position )
void pxStaticText::InsertAt( wxSizer& sizer, int position, wxSizerFlags flags )
{
sizer.Insert( position, this, pxSizerFlags::StdSpace().Align( m_alignflags ) );
sizer.Insert( position, this, flags.Align( m_alignflags ) );
_setLabel();
}
@@ -114,15 +112,9 @@ wxSize pxStaticText::GetMinSize() const
return wxSize( std::min( ideal, minSize.x ), minSize.y );
}
/*pxStaticText::operator wxSizerFlags() const
{
return pxSizerFlags::StdSpace().Align( m_alignflags );
}*/
// --------------------------------------------------------------------------------------
// pxStaticHeading Implementations
// --------------------------------------------------------------------------------------
pxStaticHeading::pxStaticHeading( wxWindow* parent, const wxString& label, int style )
: pxStaticText( parent, label, style )
{