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

Avoid use of wxString in globals, unless really necessary (C++ global/static object initializers on "complex" objects that do resource management can lead to wonky inter-dependency nightmares, plus this more efficient anyways ;) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2161 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-11-08 05:00:28 +00:00
parent 0ade7b5bd0
commit a06803d263
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/Utilities/Console.cpp
View File

@ -76,7 +76,7 @@ const IConsoleWriter ConsoleWriter_Null =
// --------------------------------------------------------------------------------------
#ifdef __LINUX__
static wxString tbl_color_codes[] =
static const wxChar* tbl_color_codes[] =
{
L"\033[30m" // black
, L"\033[31m" // red

8
pcsx2/gui/ConsoleLogger.cpp
View File

@ -639,7 +639,7 @@ void Pcsx2App::ProgramLog_PostEvent( wxEvent& evt )
// ConsoleImpl_ToFile
// --------------------------------------------------------------------------------------
static void __concall _immediate_logger( wxString src )
static void __concall _immediate_logger( const wxString& src )
{
#ifdef __LINUX__
ConsoleWriter_Stdio.DoWrite(src);
@ -851,8 +851,8 @@ public:
, m_Instdata( *(MsgboxEventResult*)NULL )
, m_Title()
, m_Content()
, m_Flags( 0 )
{
m_Flags = 0;
}
pxMessageBoxEvent( MsgboxEventResult& instdata, const wxString& title, const wxString& content, long flags ) :
@ -860,8 +860,8 @@ public:
, m_Instdata( instdata )
, m_Title( title )
, m_Content( content )
, m_Flags( flags )
{
m_Flags = flags;
}
pxMessageBoxEvent( const pxMessageBoxEvent& event ) :
@ -869,8 +869,8 @@ public:
, m_Instdata( event.m_Instdata )
, m_Title( event.m_Title )
, m_Content( event.m_Content )
, m_Flags( event.m_Flags )
{
m_Flags = event.m_Flags;
}
// Thread Safety: Must be called from the GUI thread ONLY.