X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee31c392ac73dcd67fb25ac368e2ffb7d4c9c0e7..31eefb998d894e3b566e13714fa53186101829a1:/include/wx/motif/app.h

diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index 7787929380..95c087af98 100644
--- a/include/wx/motif/app.h
+++ b/include/wx/motif/app.h
@@ -13,14 +13,13 @@
 #define _WX_APP_H_
 
 #ifdef __GNUG__
-    #pragma interface "app.h"
+#pragma interface "app.h"
 #endif
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
-#include "wx/gdicmn.h"
 #include "wx/event.h"
 
 // ----------------------------------------------------------------------------
@@ -29,9 +28,12 @@
 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxApp ;
+class WXDLLEXPORT wxApp;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
+class WXDLLEXPORT wxEventLoop;
+class WXDLLEXPORT wxXVisualInfo;
+class wxPerDisplayDataMap;
 
 // ----------------------------------------------------------------------------
 // the wxApp class for Motif - see wxAppBase for more details
@@ -39,86 +41,69 @@ class WXDLLEXPORT wxLog;
 
 class WXDLLEXPORT wxApp : public wxAppBase
 {
-DECLARE_DYNAMIC_CLASS(wxApp)
-
+    DECLARE_DYNAMIC_CLASS(wxApp)
+        
 public:
     wxApp();
-    ~wxApp() {}
-
+    virtual ~wxApp();
+    
     // override base class (pure) virtuals
     // -----------------------------------
-
+    
     virtual int MainLoop();
     virtual void ExitMainLoop();
     virtual bool Initialized();
-    virtual bool Pending() ;
-    virtual void Dispatch() ;
-
+    virtual bool Pending();
+    virtual void Dispatch();
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
+    virtual bool ProcessIdle();
+    
     virtual bool OnInitGui();
-
-    virtual wxIcon GetStdIcon(int which) const;
-
+    
     // implementation from now on
     // --------------------------
-
+    
     void OnIdle(wxIdleEvent& event);
-
+    
     // Send idle event to all top-level windows.
     // Returns TRUE if more idle time is requested.
     bool SendIdleEvents();
-
+    
     // Send idle event to window and all subwindows
     // 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);
-
+    
 protected:
     bool                  m_showOnInit;
-
+    
 public:
     // Implementation
     static bool Initialize();
     static void CleanUp();
-
+    
     void DeletePendingObjects();
-    bool ProcessIdle();
-#if wxUSE_THREADS
-    void ProcessPendingEvents();
-#endif
-
+    
     // Motif-specific
     WXAppContext   GetAppContext() const { return m_appContext; }
-    WXWidget       GetTopLevelWidget() const { return m_topLevelWidget; }
-    WXColormap     GetMainColormap(WXDisplay* display) ;
+    WXWidget       GetTopLevelWidget();
+    WXColormap     GetMainColormap(WXDisplay* display);
     WXDisplay*     GetInitialDisplay() const { return m_initialDisplay; }
-    long           GetMaxRequestSize() const { return m_maxRequestSize; }
+
+    void           SetTopLevelWidget(WXDisplay* display, WXWidget widget);
 
     // This handler is called when a property change event occurs
     virtual void   HandlePropertyChange(WXEvent *event);
 
-public:
-    static long    sm_lastMessageTime;
-    int            m_nCmdShow;
-
-protected:
-    bool                  m_keepGoing ;
+    wxXVisualInfo* GetVisualInfo(WXDisplay* display);
 
+private:
+    wxEventLoop*    m_eventLoop;
+    
     // Motif-specific
     WXAppContext          m_appContext;
-    WXWidget              m_topLevelWidget;
     WXColormap            m_mainColormap;
     WXDisplay*            m_initialDisplay;
-    long                  m_maxRequestSize;
+    wxPerDisplayDataMap*  m_perDisplayData;
 
     DECLARE_EVENT_TABLE()
 };
@@ -126,5 +111,5 @@ protected:
 int WXDLLEXPORT wxEntry( int argc, char *argv[] );
 
 #endif
-    // _WX_APP_H_
+// _WX_APP_H_