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

wxgui: 

* fixed console log position/size saving settings
 * Configure buttons in plugin selector work as they should now
 * fixed devel/release builds broken in the prev rev

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1683 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-08-26 14:27:54 +00:00
parent c73375366f
commit f39c52f5d1
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/CDVD/CDVD.cpp
View File

@ -393,7 +393,7 @@ void cdvdReadKey(u8 arg0, u16 arg1, u32 arg2, u8* key) {
key[15] = 0x01; key[15] = 0x01;
} }
Console::WriteLn( "CDVD->KEY = %02X,%02X,%02X,%02X,%02X,%02X,%02X", params Console::WriteLn( "CDVD.KEY = %02X,%02X,%02X,%02X,%02X,%02X,%02X", params
cdvd.Key[0],cdvd.Key[1],cdvd.Key[2],cdvd.Key[3],cdvd.Key[4],cdvd.Key[14],cdvd.Key[15] ); cdvd.Key[0],cdvd.Key[1],cdvd.Key[2],cdvd.Key[3],cdvd.Key[4],cdvd.Key[14],cdvd.Key[15] );
// Now's a good time to reload the ELF info... // Now's a good time to reload the ELF info...

6
pcsx2/gui/AppAssert.cpp
View File

@ -68,14 +68,14 @@ static wxString pxGetStackTrace()
return stackTrace; return stackTrace;
} }
static __threadlocal bool _reentrant_lock = false;
#ifdef __WXDEBUG__
wxString pxAppTraits::GetAssertStackTrace() wxString pxAppTraits::GetAssertStackTrace()
{ {
return pxGetStackTrace(); return pxGetStackTrace();
} }
static __threadlocal bool _reentrant_lock = false;
#ifdef __WXDEBUG__
// This override of wx's implementation provides thread safe assertion message reporting. If we aren't // This override of wx's implementation provides thread safe assertion message reporting. If we aren't
// on the main gui thread then the assertion message box needs to be passed off to the main gui thread // on the main gui thread then the assertion message box needs to be passed off to the main gui thread
// via messages. // via messages.

2
pcsx2/gui/ConsoleLogger.cpp
View File

@ -224,7 +224,7 @@ enum MenuIDs_t
}; };
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
ConsoleLogFrame::ConsoleLogFrame( MainEmuFrame *parent, const wxString& title, const AppConfig::ConsoleLogOptions& options ) : ConsoleLogFrame::ConsoleLogFrame( MainEmuFrame *parent, const wxString& title, AppConfig::ConsoleLogOptions& options ) :
wxFrame(parent, wxID_ANY, title) wxFrame(parent, wxID_ANY, title)
, m_conf( options ) , m_conf( options )
, m_TextCtrl( *new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, , m_TextCtrl( *new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,

4
pcsx2/gui/ConsoleLogger.h
View File

@ -101,7 +101,7 @@ protected:
}; };
protected: protected:
ConLogConfig m_conf; ConLogConfig& m_conf;
wxTextCtrl& m_TextCtrl; wxTextCtrl& m_TextCtrl;
ColorArray m_ColorTable; ColorArray m_ColorTable;
Console::Colors m_curcolor; Console::Colors m_curcolor;
@ -114,7 +114,7 @@ protected:
public: public:
// ctor & dtor // ctor & dtor
ConsoleLogFrame( MainEmuFrame *pParent, const wxString& szTitle, const ConLogConfig& options ); ConsoleLogFrame( MainEmuFrame *pParent, const wxString& szTitle, ConLogConfig& options );
virtual ~ConsoleLogFrame(); virtual ~ConsoleLogFrame();
virtual void Write( const wxString& text ); virtual void Write( const wxString& text );

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

@ -316,7 +316,7 @@ bool Panels::PluginSelectorPanel::ValidateEnumerationStatus()
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
void Panels::PluginSelectorPanel::OnConfigure_Clicked( wxCommandEvent& evt ) void Panels::PluginSelectorPanel::OnConfigure_Clicked( wxCommandEvent& evt )
{ {
PluginsEnum_t pid = (PluginsEnum_t)(int)evt.GetClientData(); PluginsEnum_t pid = (PluginsEnum_t)(int)((wxEvtHandler*)evt.GetEventObject())->GetClientData();
int sel = m_ComponentBoxes.Get(pid).GetSelection(); int sel = m_ComponentBoxes.Get(pid).GetSelection();
if( sel == wxNOT_FOUND ) return; if( sel == wxNOT_FOUND ) return;