Applied patch [ 679397 ] remove GPL code from motif build

[wxWidgets.git] / include / wx / x11 / app.h

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index aec0f3e3675af7a35a2b3b29adddd5dd29f80cfd..3621558b9f41e46a9b4b70c7a367cc8ff812d8a1 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -44,7 +44,7 @@ class WXDLLEXPORT wxApp : public wxAppBase
         
 public:
     wxApp();
         
 public:
     wxApp();

-    ~wxApp() {}
+    ~wxApp();

     
     // override base class (pure) virtuals
     // -----------------------------------
     
     // override base class (pure) virtuals
     // -----------------------------------


@@ -55,6 +55,7 @@ public:
     virtual bool Pending();
     virtual void Dispatch();
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual bool Pending();
     virtual void Dispatch();
     virtual bool Yield(bool onlyIfNeeded = FALSE);

+    virtual bool ProcessIdle();

     
     virtual bool OnInitGui();
     
     
     virtual bool OnInitGui();
     


@@ -74,7 +75,9 @@ public:
     // Processes an X event.
     virtual bool ProcessXEvent(WXEvent* event);
     
     // 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;
     
 protected:
     bool                  m_showOnInit;


@@ -85,7 +88,6 @@ public:
     static void CleanUp();
     
     void DeletePendingObjects();
     static void CleanUp();
     
     void DeletePendingObjects();

-    bool ProcessIdle();

     
     WXWindow       GetTopLevelWidget() const { return m_topLevelWidget; }
     WXColormap     GetMainColormap(WXDisplay* display);
     
     WXWindow       GetTopLevelWidget() const { return m_topLevelWidget; }
     WXColormap     GetMainColormap(WXDisplay* display);


@@ -94,19 +96,47 @@ public:
     // This handler is called when a property change event occurs
     virtual bool HandlePropertyChange(WXEvent *event);
     
     // This handler is called when a property change event occurs
     virtual bool HandlePropertyChange(WXEvent *event);
     

-    // We need this before create the app
-    static   WXDisplay* GetDisplay() { return ms_display; }
-    static   WXDisplay* ms_display;
-

     // Values that can be passed on the command line.
     // Returns -1, -1 if none specified.
     const wxSize& GetInitialSize() const { return m_initialSize; }
     bool GetShowIconic() const { return m_showIconic; }
     
     // Values that can be passed on the command line.
     // Returns -1, -1 if none specified.
     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;
+

 public:
     static long           sm_lastMessageTime;
     bool                  m_showIconic;    
     wxSize                m_initialSize;
 public:
     static long           sm_lastMessageTime;
     bool                  m_showIconic;    
     wxSize                m_initialSize;

+
+#if !wxUSE_NANOX    
+    // Someone find a better place for these
+    int                   m_visualType;   // TrueColor, DirectColor etc.
+    int                   m_visualDepth;
+    int                   m_visualColormapSize;
+    void                 *m_visualColormap;
+    int                   m_visualScreen;
+    unsigned long         m_visualRedMask;
+    unsigned long         m_visualGreenMask;
+    unsigned long         m_visualBlueMask;
+    int                   m_visualRedShift;
+    int                   m_visualGreenShift;
+    int                   m_visualBlueShift;
+    int                   m_visualRedPrec;
+    int                   m_visualGreenPrec;
+    int                   m_visualBluePrec;
+    
+    unsigned char        *m_colorCube;
+#endif
+    

 protected:
     bool                  m_keepGoing;
     
 protected:
     bool                  m_keepGoing;