clean ups to wxX11+wxUniv handling

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

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index 66cdcb09a8dff26ffd8f772be1dae69d16461493..402a8dbf092b1d5e7037a84e1b171ee57f9e08ae 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -32,6 +32,7 @@ class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxApp;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
+class WXDLLEXPORT wxEventLoop;
 
 // ----------------------------------------------------------------------------
 // the wxApp class for Motif - see wxAppBase for more details
@@ -75,14 +76,7 @@ public:
     // Processes an X event.
     virtual void ProcessXEvent(WXEvent* event);
     
-    // Returns TRUE if an accelerator has been processed
-    virtual bool CheckForAccelerator(WXEvent* event);
-    
-    // Returns TRUE if a key down event has been processed
-    virtual bool CheckForKeyDown(WXEvent* event);
-    
-    // Returns TRUE if a key up event has been processed
-    virtual bool CheckForKeyUp(WXEvent* event);
+    virtual void OnAssert(const wxChar *file, int line, const wxChar *msg);
     
 protected:
     bool                  m_showOnInit;
@@ -97,12 +91,15 @@ public:
     
     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);
     
+    // 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;
@@ -112,8 +109,8 @@ protected:
     
     WXWindow              m_topLevelWidget;
     WXColormap            m_mainColormap;
-    WXDisplay*            m_initialDisplay;
     long                  m_maxRequestSize;
+    wxEventLoop*          m_mainLoop;
     
     DECLARE_EVENT_TABLE()
 };