diff --git a/common/src/Utilities/Exceptions.cpp b/common/src/Utilities/Exceptions.cpp
index f9a843ea37..3cef8f9c04 100644
--- a/common/src/Utilities/Exceptions.cpp
+++ b/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()
) );
diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp
index a0e2b8488e..a4266716a7 100644
--- a/pcsx2/Linux/pcsx2.cbp
+++ b/pcsx2/Linux/pcsx2.cbp
@@ -346,8 +346,9 @@
-
+
+
@@ -380,6 +381,7 @@
+
@@ -497,11 +499,11 @@
+
-
-
+
diff --git a/pcsx2/PluginManager.cpp b/pcsx2/PluginManager.cpp
index 2ffca15ece..21065f1fd3 100644
--- a/pcsx2/PluginManager.cpp
+++ b/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");
}
diff --git a/pcsx2/ZipTools/ThreadedZipTools.h b/pcsx2/ZipTools/ThreadedZipTools.h
index e09e92e413..e9c5976653 100644
--- a/pcsx2/ZipTools/ThreadedZipTools.h
+++ b/pcsx2/ZipTools/ThreadedZipTools.h
@@ -93,7 +93,7 @@ protected:
public:
CompressThread_gzip( const wxString& file, SafeArray* srcdata, FnType_WriteCompressedHeader* writeHeader=NULL );
- CompressThread_gzip( const wxString& file, ScopedPtr>& srcdata, FnType_WriteCompressedHeader* writeHeader=NULL );
+ CompressThread_gzip( const wxString& file, ScopedPtr >& srcdata, FnType_WriteCompressedHeader* writeHeader=NULL );
virtual ~CompressThread_gzip() throw();
protected:
diff --git a/pcsx2/ZipTools/thread_gzip.cpp b/pcsx2/ZipTools/thread_gzip.cpp
index 64932a536c..d3ff3abd8a 100644
--- a/pcsx2/ZipTools/thread_gzip.cpp
+++ b/pcsx2/ZipTools/thread_gzip.cpp
@@ -25,8 +25,9 @@ CompressThread_gzip::CompressThread_gzip( const wxString& file, SafeArray* s
{
m_gzfp = NULL;
}
-
-CompressThread_gzip::CompressThread_gzip( const wxString& file, ScopedPtr>& srcdata, FnType_WriteCompressedHeader* writeheader )
+
+// Believe it or not, the space in > > is required.
+CompressThread_gzip::CompressThread_gzip( const wxString& file, ScopedPtr >& srcdata, FnType_WriteCompressedHeader* writeheader )
: BaseCompressThread( file, srcdata.DetachPtr(), writeheader )
{
m_gzfp = NULL;
diff --git a/pcsx2/gui/AppCorePlugins.cpp b/pcsx2/gui/AppCorePlugins.cpp
index 5e2ae7bd3b..06c8759eec 100644
--- a/pcsx2/gui/AppCorePlugins.cpp
+++ b/pcsx2/gui/AppCorePlugins.cpp
@@ -261,6 +261,7 @@ protected:
{
CorePlugins.Load( m_folders );
}
+ ~LoadCorePluginsEvent() throw() {}
};
// --------------------------------------------------------------------------------------
diff --git a/pcsx2/gui/AppCoreThread.h b/pcsx2/gui/AppCoreThread.h
index 93c6cd7632..67e8ee974e 100644
--- a/pcsx2/gui/AppCoreThread.h
+++ b/pcsx2/gui/AppCoreThread.h
@@ -15,7 +15,7 @@
#pragma once
-#include "SysThreads.h"
+#include "System/SysThreads.h"
#include "AppCommon.h"
#include "AppCorePlugins.h"
diff --git a/pcsx2/gui/ExecutorThread.cpp b/pcsx2/gui/ExecutorThread.cpp
index be74dc5c59..c138ffc6f7 100644
--- a/pcsx2/gui/ExecutorThread.cpp
+++ b/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();
diff --git a/pcsx2/gui/Panels/PluginSelectorPanel.cpp b/pcsx2/gui/Panels/PluginSelectorPanel.cpp
index 0c4f395860..2b2d5dda9d 100644
--- a/pcsx2/gui/Panels/PluginSelectorPanel.cpp
+++ b/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
diff --git a/pcsx2/gui/SysState.cpp b/pcsx2/gui/SysState.cpp
index 1da3eb80a2..4242db835c 100644
--- a/pcsx2/gui/SysState.cpp
+++ b/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 state_buffer( L"Public Savestate Buffer" );
@@ -152,8 +152,9 @@ public:
}
SysExecEvent_ZipToDisk* Clone() const { return new SysExecEvent_ZipToDisk( *this ); }
-
- SysExecEvent_ZipToDisk( ScopedPtr>& src, const wxString& filename )
+
+// Yep, gcc doesn't like >> again.
+ SysExecEvent_ZipToDisk( ScopedPtr >& 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> zipbuf(new SafeArray( L"Zippable Savestate" ));
+ ScopedPtr > zipbuf(new SafeArray( L"Zippable Savestate" ));
GetSysExecutorThread().PostEvent(new SysExecEvent_DownloadState( zipbuf ));
GetSysExecutorThread().PostEvent(new SysExecEvent_ZipToDisk( zipbuf, file ));
}
diff --git a/pcsx2/gui/UpdateUI.cpp b/pcsx2/gui/UpdateUI.cpp
index 2a60fd0356..ac3bdce24f 100644
--- a/pcsx2/gui/UpdateUI.cpp
+++ b/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 )