X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58ec225526177917a3806c6cd394ab56d18280e1..44d130a35e7973911686d664bcf275a538990d52:/src/x11/app.cpp?ds=sidebyside

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 46eeb9379a..2f2a28be29 100644
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -105,6 +105,10 @@ bool wxApp::Initialize()
 {
     wxClassInfo::InitializeClasses();
 
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
+
     // GL: I'm annoyed ... I don't know where to put this and I don't want to
     // create a module for that as it's part of the core.
 #if wxUSE_THREADS
@@ -1219,12 +1223,14 @@ bool wxApp::Yield(bool onlyIfNeeded)
     return TRUE;
 }
 
-void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
+#ifdef __WXDEBUG__
+
+void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
 {
     // While the GUI isn't working that well, just print out the
     // message.
 #if 1
-    wxAppBase::OnAssert(file, line, msg);
+    wxAppBase::OnAssert(file, line, cond, msg);
 #else
     wxString msg2;
     msg2.Printf("At file %s:%d: %s", file, line, msg);
@@ -1232,3 +1238,5 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
 #endif
 }
 
+#endif // __WXDEBUG__
+