X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8601b2e15bf924d4be6b7843064028e514a71ec8..138618acb91e2a879a735c5806f9f728220f14df:/include/wx/x11/app.h

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 0a689ed00f..3621558b9f 100644
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -55,6 +55,7 @@ public:
     virtual bool Pending();
     virtual void Dispatch();
     virtual bool Yield(bool onlyIfNeeded = FALSE);
+    virtual bool ProcessIdle();
     
     virtual bool OnInitGui();
     
@@ -74,7 +75,9 @@ public:
     // Processes an X event.
     virtual bool ProcessXEvent(WXEvent* event);
     
-    virtual void OnAssert(const wxChar *file, int line, const wxChar *msg);
+#ifdef __WXDEBUG__
+    virtual void OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg);
+#endif // __WXDEBUG__
     
 protected:
     bool                  m_showOnInit;
@@ -85,7 +88,6 @@ public:
     static void CleanUp();
     
     void DeletePendingObjects();
-    bool ProcessIdle();
     
     WXWindow       GetTopLevelWidget() const { return m_topLevelWidget; }
     WXColormap     GetMainColormap(WXDisplay* display);
@@ -99,6 +101,13 @@ public:
     const wxSize& GetInitialSize() const { return m_initialSize; }
     bool GetShowIconic() const { return m_showIconic; }
     
+#if wxUSE_UNICODE
+    // Global context for Pango layout. Either use X11
+    // or use Xft rendering according to GDK_USE_XFT
+    // environment variable
+    PangoContext* GetPangoContext();
+#endif    
+    
     // We need this before creating the app
     static   WXDisplay* GetDisplay() { return ms_display; }
     static   WXDisplay* ms_display;