X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d715d419e1a31e94ff6ce4cc21eb985b2bef3369..9c34dd9deafaa428534b498b90799687a7dcddaa:/src/x11/app.cpp

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index a1eb5192b5..dfdb222158 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
@@ -510,7 +514,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
         case Expose:
         {
 #if wxUSE_TWO_WINDOWS && !wxUSE_NANOX
-            if (event->xexpose.window != (Window)win->GetClientWindow())
+            if (event->xexpose.window != (Window)win->GetClientAreaWindow())
             {
                 XEvent tmp_event;
                 wxExposeInfo info;
@@ -552,7 +556,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 
                 // If we only have one X11 window, always indicate
                 // that borders might have to be redrawn.
-                if (win->GetMainWindow() == win->GetClientWindow())
+                if (win->GetMainWindow() == win->GetClientAreaWindow())
                     win->NeedUpdateNcAreaInIdle();
 
                 // Only erase background, paint in idle time.
@@ -1221,12 +1225,12 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
 #ifdef __WXDEBUG__
 
-void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
+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);