added wxUpdateUIEvent handling to wxMGL

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 621cf13a3385d06195cf64ff477eaac8399fd8f6..402a8dbf092b1d5e7037a84e1b171ee57f9e08ae 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -76,6 +76,8 @@ public:
     // Processes an X event.
     virtual void ProcessXEvent(WXEvent* event);
     
     // Processes an X event.
     virtual void ProcessXEvent(WXEvent* event);
     

+    virtual void OnAssert(const wxChar *file, int line, const wxChar *msg);
+    

 protected:
     bool                  m_showOnInit;
     
 protected:
     bool                  m_showOnInit;
     


@@ -89,12 +91,15 @@ public:
     
     WXWindow       GetTopLevelWidget() const { return m_topLevelWidget; }
     WXColormap     GetMainColormap(WXDisplay* display);
     
     WXWindow       GetTopLevelWidget() const { return m_topLevelWidget; }
     WXColormap     GetMainColormap(WXDisplay* display);

-    WXDisplay*     GetInitialDisplay() const { return m_initialDisplay; }

     long           GetMaxRequestSize() const { return m_maxRequestSize; }
     
     // This handler is called when a property change event occurs
     virtual void   HandlePropertyChange(WXEvent *event);
     
     long           GetMaxRequestSize() const { return m_maxRequestSize; }
     
     // This handler is called when a property change event occurs
     virtual void   HandlePropertyChange(WXEvent *event);
     

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

 public:
     static long    sm_lastMessageTime;
     int            m_nCmdShow;
 public:
     static long    sm_lastMessageTime;
     int            m_nCmdShow;


@@ -104,7 +109,6 @@ protected:
     
     WXWindow              m_topLevelWidget;
     WXColormap            m_mainColormap;
     
     WXWindow              m_topLevelWidget;
     WXColormap            m_mainColormap;

-    WXDisplay*            m_initialDisplay;

     long                  m_maxRequestSize;
     wxEventLoop*          m_mainLoop;
     
     long                  m_maxRequestSize;
     wxEventLoop*          m_mainLoop;