From 18a6403852bd1160d0a90b6ff6fec4c24b7b3e53 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Tue, 19 May 2015 17:38:38 +0200 Subject: [PATCH] common-wx3: fix nasty bug between overload function of pxOnAssert --- common/src/Utilities/Exceptions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/Utilities/Exceptions.cpp b/common/src/Utilities/Exceptions.cpp index 7272f9af6f..d600c7553c 100644 --- a/common/src/Utilities/Exceptions.cpp +++ b/common/src/Utilities/Exceptions.cpp @@ -143,7 +143,7 @@ __fi void pxOnAssert( const DiagnosticOrigin& origin, const char* msg) #if wxMAJOR_VERSION >= 3 __fi void pxOnAssert( const DiagnosticOrigin& origin, const wxString& msg) { - pxOnAssert( origin, WX_STR(msg) ); // wc_str ??? + pxOnAssert( origin, msg.wc_str() ); } __fi void pxOnAssert( const DiagnosticOrigin& origin, const FastFormatUnicode& msg)