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

Fix broken dialog box labels from last night's commit. 

Add a note to the Video Panel that it DOES NOT WORK YET. ;)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2228 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-11-20 11:25:48 +00:00
parent d6f9462ffa
commit 799b89ab65
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/include/Utilities/wxGuiTools.h
View File

@ -181,11 +181,18 @@ pxWindowAndFlags<WinType> operator | ( const wxSizerFlags& _flgs, WinType& _win
extern void operator+=( wxSizer& target, wxWindow* src );
extern void operator+=( wxSizer& target, wxSizer* src );
extern void operator+=( wxSizer& target, int spacer );
extern void operator+=( wxWindow& target, wxWindow* src );
extern void operator+=( wxWindow& target, wxSizer* src );
extern void operator+=( wxWindow& target, int spacer );
// Important: This template is needed in order to retain window type information and
// invoke the proper overloaded version of += (which is used by pxStaticText and other
// classes to perform special actions when added to sizers).
template< typename WinType >
void operator+=( wxWindow& target, WinType* src )
{
if( !pxAssert( target.GetSizer() != NULL ) ) return;
*target.GetSizer() += src;
}
template< typename WinType >
void operator+=( wxSizer& target, const pxWindowAndFlags<WinType>& src )
{

12
common/src/Utilities/wxGuiTools.cpp
View File

@ -115,18 +115,6 @@ void operator+=( wxSizer& target, int spacer )
target.AddSpacer( spacer );
}
void operator+=( wxWindow& target, wxWindow* src )
{
if( !pxAssert( target.GetSizer() != NULL ) ) return;
*target.GetSizer() += src;
}
void operator+=( wxWindow& target, wxSizer* src )
{
if( !pxAssert( target.GetSizer() != NULL ) ) return;
*target.GetSizer() += src;
}
void operator+=( wxWindow& target, int spacer )
{
if( !pxAssert( target.GetSizer() != NULL ) ) return;

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

@ -54,6 +54,10 @@ wxTextCtrl* CreateNumericalTextCtrl( wxWindow* parent, int digits )
return ctrl;
}
// --------------------------------------------------------------------------------------
// FramelimiterPanel Implementations
// --------------------------------------------------------------------------------------
Panels::FramelimiterPanel::FramelimiterPanel( wxWindow* parent )
: BaseApplicableConfigPanel( parent )
{
@ -137,12 +141,27 @@ Panels::FramelimiterPanel::FramelimiterPanel( wxWindow* parent )
m_text_BaseNtsc ->SetValue( L"59.94" );
m_text_BasePal ->SetValue( L"50.00" );
OnSettingsChanged();
}
void Panels::FramelimiterPanel::OnSettingsChanged()
{
const Pcsx2Config::VideoOptions& conf( g_Conf->EmuOptions.Video );
// TODO : Apply options from config *to* checkboxes (once video config struct is implemented)
}
void Panels::FramelimiterPanel::Apply()
{
Pcsx2Config::VideoOptions& conf( g_Conf->EmuOptions.Video );
// TODO : Apply options from checkboxes (once video config struct is is implemented)
}
// --------------------------------------------------------------------------------------
// GSWindowSetting Implementation
// --------------------------------------------------------------------------------------
Panels::GSWindowSettingsPanel::GSWindowSettingsPanel( wxWindow* parent )
: BaseApplicableConfigPanel( parent )
@ -210,6 +229,10 @@ void Panels::GSWindowSettingsPanel::Apply()
{
}
// --------------------------------------------------------------------------------------
// VideoPanel Implementation
// --------------------------------------------------------------------------------------
Panels::VideoPanel::VideoPanel( wxWindow* parent ) :
BaseApplicableConfigPanel( parent )
{
@ -232,6 +255,7 @@ Panels::VideoPanel::VideoPanel( wxWindow* parent ) :
*s_table += left | StdExpand();
*s_table += right | StdExpand();
*this += StaticHeading(L"This panel is not implemented yet.\nIT DOES NOT WORK. AT ALL.");
*this += s_table;
// TODO: