X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..cbc906ceb79ba18e53fb94a563648b0347a1b15f:/include/wx/x11/app.h

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index d3bc19d40b..1f487dbbc8 100644
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -32,9 +32,10 @@ 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
+// the wxApp class for wxX11 - see wxAppBase for more details
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxApp : public wxAppBase
@@ -72,19 +73,10 @@ public:
     // Returns TRUE if more idle time is requested.
     bool SendIdleEvents(wxWindow* win);
     
-    // Motif implementation.
-    
     // 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,29 +89,33 @@ public:
     void DeletePendingObjects();
     bool ProcessIdle();
     
-    // Motif-specific
-    WXAppContext   GetAppContext() const { return m_appContext; }
-    WXWidget       GetTopLevelWidget() const { return m_topLevelWidget; }
+    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);
     
-public:
-    static long    sm_lastMessageTime;
-    int            m_nCmdShow;
+    // 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; }
     
+public:
+    static long           sm_lastMessageTime;
+    bool                  m_showIconic;    
+    wxSize                m_initialSize;
 protected:
     bool                  m_keepGoing;
     
-    // Motif-specific
-    WXAppContext          m_appContext;
-    WXWidget              m_topLevelWidget;
+    WXWindow              m_topLevelWidget;
     WXColormap            m_mainColormap;
-    WXDisplay*            m_initialDisplay;
     long                  m_maxRequestSize;
+    wxEventLoop*          m_mainLoop;
     
     DECLARE_EVENT_TABLE()
 };