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 d3bc19d40b8441bc48959658c1024291854fdb3f..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 wxApp;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;

+class WXDLLEXPORT wxEventLoop;

 
 // ----------------------------------------------------------------------------
 // the wxApp class for Motif - see wxAppBase for more details
 
 // ----------------------------------------------------------------------------
 // the wxApp class for Motif - see wxAppBase for more details


@@ -72,19 +73,10 @@ public:
     // Returns TRUE if more idle time is requested.
     bool SendIdleEvents(wxWindow* win);
     
     // Returns TRUE if more idle time is requested.
     bool SendIdleEvents(wxWindow* win);
     

-    // Motif implementation.
-    

     // Processes an X event.
     virtual void ProcessXEvent(WXEvent* event);
     
     // 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;
     
 protected:
     bool                  m_showOnInit;


@@ -97,16 +89,17 @@ public:
     void DeletePendingObjects();
     bool ProcessIdle();
     
     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);
     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;


@@ -114,12 +107,10 @@ public:
 protected:
     bool                  m_keepGoing;
     
 protected:
     bool                  m_keepGoing;
     

-    // Motif-specific
-    WXAppContext          m_appContext;
-    WXWidget              m_topLevelWidget;
+    WXWindow              m_topLevelWidget;

     WXColormap            m_mainColormap;
     WXColormap            m_mainColormap;

-    WXDisplay*            m_initialDisplay;

     long                  m_maxRequestSize;
     long                  m_maxRequestSize;

+    wxEventLoop*          m_mainLoop;

     
     DECLARE_EVENT_TABLE()
 };
     
     DECLARE_EVENT_TABLE()
 };