Fix the panic alert hack for windows and osx. The macro needed to be defined after HAVE_WX is defined. That explains why windows accepted the string concatenation that I thought it wouldn't.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6829 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 8 insertions, 8 deletions

diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index 8f08d8d4a7..a130d39e20 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -117,6 +117,14 @@ private:
 #include "config.h"	// SCons autoconfiguration defines
 #endif
 
+#if defined(HAVE_WX) && HAVE_WX
+// This should be used to mark c strings as translatable in PanicAlerts but only in
+// wxWidgets portions of the code.
+#define _wxt(a) (std::string(wxString(wxGetTranslation(wxT(a))).To8BitData()).c_str())
+#else
+#define _wxt(a) a
+#endif
+
 // Windows compatibility
 #ifndef _WIN32
 #include <limits.h>
diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h
index 6545c4b92e..6fa602a31d 100644
--- a/Source/Core/Common/Src/CommonFuncs.h
+++ b/Source/Core/Common/Src/CommonFuncs.h
@@ -122,14 +122,6 @@ inline T max(const T& a, const T& b) {return a > b ? a : b;}
 // Defined in Misc.cpp.
 const char* GetLastErrorMsg();
 
-#if defined(HAVE_WX) && HAVE_WX
-// This should be used to mark c strings as translatable in PanicAlerts but only in
-// wxWidgets portions of the code.
-#define _wxt(a) (std::string(wxString(wxGetTranslation(wxT(a))).To8BitData()).c_str())
-#else
-#define _wxt(a) a
-#endif
-
 namespace Common
 {
 inline u8 swap8(u8 _data) {return _data;}