A rubber chicken with a pulley in the middle...what possible use could that have?

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2923 96395faa-99c1-11dd-bbfe-3dabce05a288

common/src/Utilities/Exceptions.cpp

@@ -175,7 +175,7 @@ wxString BaseException::FormatDiagnosticMessage() const
 Exception::RuntimeError::RuntimeError( const std::runtime_error& ex, const wxString& prefix )
 {
 	const wxString msg( wxsFormat( L"%sSTL Runtime Error: %s",
-		(prefix.IsEmpty() ? prefix : wxsFormat(L"(%s) ", prefix)),
+		(prefix.IsEmpty() ? prefix.c_str() : wxsFormat(L"(%s) ", prefix.c_str()).c_str()),
 		fromUTF8( ex.what() ).c_str()
 	) );
 

pcsx2/Linux/pcsx2.cbp

@@ -346,8 +346,9 @@
 		<Unit filename="../gui/AppAssert.cpp" />
 		<Unit filename="../gui/AppConfig.cpp" />
 		<Unit filename="../gui/AppConfig.h" />
-		<Unit filename="../gui/AppCoreThread.cpp" />
 		<Unit filename="../gui/AppCorePlugins.cpp" />
+		<Unit filename="../gui/AppCorePlugins.h" />
+		<Unit filename="../gui/AppCoreThread.cpp" />
 		<Unit filename="../gui/AppCoreThread.h" />
 		<Unit filename="../gui/AppEventListeners.h" />
 		<Unit filename="../gui/AppEventSources.cpp" />
@@ -380,6 +381,7 @@
 		<Unit filename="../gui/Dialogs/PickUserModeDialog.cpp" />
 		<Unit filename="../gui/Dialogs/StuckThreadDialog.cpp" />
 		<Unit filename="../gui/Dialogs/SysConfigDialog.cpp" />
+		<Unit filename="../gui/ExecutorThread.cpp" />
 		<Unit filename="../gui/ExecutorThread.h" />
 		<Unit filename="../gui/FrameForGS.cpp" />
 		<Unit filename="../gui/GlobalCommands.cpp" />
@@ -497,11 +499,11 @@
 		<Unit filename="../gui/Saveslots.cpp" />
 		<Unit filename="../gui/SysState.cpp" />
 		<Unit filename="../gui/UpdateUI.cpp" />
+		<Unit filename="../gui/gsFrame.h" />
 		<Unit filename="../gui/i18n.cpp" />
 		<Unit filename="../gui/i18n.h" />
-		<Unit filename="../gui/gsFrame.h" />
-		<Unit filename="../gui/pxLogTextCtrl.cpp" />
 		<Unit filename="../gui/pxEvtThread.h" />
+		<Unit filename="../gui/pxLogTextCtrl.cpp" />
 		<Unit filename="../pcsx2hostfs.cpp" />
 		<Unit filename="../ps2/BiosTools.cpp" />
 		<Unit filename="../ps2/BiosTools.h" />

pcsx2/PluginManager.cpp

@@ -1486,12 +1486,12 @@ const wxString PluginManager::GetName( PluginsEnum_t pid ) const
 {
 	ScopedLock lock( m_mtx_PluginStatus );
 	pxAssume( (uint)pid < PluginId_Count );
-	return m_info[pid] ? m_info[pid]->Name : _("Unloaded Plugin");
+	return m_info[pid] ? m_info[pid]->Name : wxT("Unloaded Plugin");
 }
 
 const wxString PluginManager::GetVersion( PluginsEnum_t pid ) const
 {
 	ScopedLock lock( m_mtx_PluginStatus );
 	pxAssume( (uint)pid < PluginId_Count );
-	return m_info[pid] ? m_info[pid]->Version : _("0.0");
+	return m_info[pid] ? m_info[pid]->Version : wxT("0.0");
 }

pcsx2/ZipTools/ThreadedZipTools.h

@@ -93,7 +93,7 @@ protected:
 
 public:
 	CompressThread_gzip( const wxString& file, SafeArray<u8>* srcdata, FnType_WriteCompressedHeader* writeHeader=NULL );
-	CompressThread_gzip( const wxString& file, ScopedPtr<SafeArray<u8>>& srcdata, FnType_WriteCompressedHeader* writeHeader=NULL );
+	CompressThread_gzip( const wxString& file, ScopedPtr<SafeArray<u8> >& srcdata, FnType_WriteCompressedHeader* writeHeader=NULL );
 	virtual ~CompressThread_gzip() throw();
 
 protected:

pcsx2/ZipTools/thread_gzip.cpp

@@ -25,8 +25,9 @@ CompressThread_gzip::CompressThread_gzip( const wxString& file, SafeArray<u8>* s
 {
 	m_gzfp	= NULL;
 }
-
+
-CompressThread_gzip::CompressThread_gzip( const wxString& file, ScopedPtr<SafeArray<u8>>& srcdata, FnType_WriteCompressedHeader* writeheader )
+// Believe it or not, the space in > > is required.
+CompressThread_gzip::CompressThread_gzip( const wxString& file, ScopedPtr<SafeArray<u8> >& srcdata, FnType_WriteCompressedHeader* writeheader )
 	: BaseCompressThread( file, srcdata.DetachPtr(), writeheader )
 {
 	m_gzfp	= NULL;

pcsx2/gui/AppCorePlugins.cpp

@@ -261,6 +261,7 @@ protected:
 	{
 		CorePlugins.Load( m_folders );
 	}
+	~LoadCorePluginsEvent() throw() {}
 };
 
 // --------------------------------------------------------------------------------------

pcsx2/gui/AppCoreThread.h

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "SysThreads.h"
+#include "System/SysThreads.h"
 #include "AppCommon.h"
 #include "AppCorePlugins.h"
 

pcsx2/gui/ExecutorThread.cpp

@@ -28,7 +28,7 @@ void SysExecEvent::SetException( BaseException* ex )
 {
 	if( !ex ) return;
 
-	const wxString& prefix( wxsFormat(L"(%s) ", GetEventName()) );
+	const wxString& prefix( wxsFormat(L"(%s) ", GetEventName().c_str()) );
 	ex->DiagMsg() = prefix + ex->DiagMsg();
 	//ex->UserMsg() = prefix + ex->UserMsg();
 

pcsx2/gui/Panels/PluginSelectorPanel.cpp

@@ -244,7 +244,8 @@ void SysExecEvent_ApplyPlugins::_DoInvoke()
 	if( SysHasValidState() )
 	{
 		paused_core.AllowResume();
-		wxGetApp().ProcessEvent( ApplyOverValidStateEvent( m_dialog ) );
+		ApplyOverValidStateEvent aEvt( m_dialog );
+		wxGetApp().ProcessEvent( aEvt );
 		paused_core.DisallowResume();
 
 		// FIXME : We only actually have to save plugins here, except the recovery code

pcsx2/gui/SysState.cpp

@@ -16,10 +16,10 @@
 #include "PrecompiledHeader.h"
 #include "App.h"
 
-#include "SysThreads.h"
+#include "System/SysThreads.h"
 #include "SaveState.h"
 
-#include "ZipTools\ThreadedZipTools.h"
+#include "ZipTools/ThreadedZipTools.h"
 
 // Used to hold the current state backup (fullcopy of PS2 memory and plugin states).
 static SafeArray<u8> state_buffer( L"Public Savestate Buffer" );
@@ -152,8 +152,9 @@ public:
 	}
 
 	SysExecEvent_ZipToDisk* Clone() const { return new SysExecEvent_ZipToDisk( *this ); }
-
+
-	SysExecEvent_ZipToDisk( ScopedPtr<SafeArray<u8>>& src, const wxString& filename )
+// Yep, gcc doesn't like >> again.
+	SysExecEvent_ZipToDisk( ScopedPtr<SafeArray<u8> >& src, const wxString& filename )
 		: m_filename( filename )
 	{
 		m_src_buffer = src.DetachPtr();
@@ -262,7 +263,7 @@ void StateCopy_FreezeToMem()
 
 void StateCopy_SaveToFile( const wxString& file )
 {
-	ScopedPtr<SafeArray<u8>> zipbuf(new SafeArray<u8>( L"Zippable Savestate" ));
+	ScopedPtr<SafeArray<u8> > zipbuf(new SafeArray<u8>( L"Zippable Savestate" ));
 	GetSysExecutorThread().PostEvent(new SysExecEvent_DownloadState( zipbuf ));
 	GetSysExecutorThread().PostEvent(new SysExecEvent_ZipToDisk( zipbuf, file ));
 }

pcsx2/gui/UpdateUI.cpp

@@ -14,10 +14,10 @@
  */
 
 #include "PrecompiledHeader.h"
-#include "Mainframe.h"
+#include "MainFrame.h"
 #include "GSFrame.h"
 
-// This is necessary because this stupid wxWdigets thing has implicit debug errors
+// This is necessary because this stupid wxWidgets thing has implicit debug errors
 // in the FindItem call that asserts if the menu options are missing.  This is bad
 // mojo for configurable/dynamic menus. >_<
 void MainEmuFrame::EnableMenuItem( int id, bool enable )