X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ce8d6a2b0fec3ce3f6e838445fdea3445d2ce8d..f7f8a13c0466725ffffc0cbe9f10da729c3423dd:/include/wx/motif/app.h

diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index a0d914b1df..1fb7f951ec 100644
--- a/include/wx/motif/app.h
+++ b/include/wx/motif/app.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        app.h
+// Name:        wx/motif/app.h
 // Purpose:     wxApp class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,108 +11,83 @@
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
-#ifdef __GNUG__
-#pragma interface "app.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 #include "wx/event.h"
+#include "wx/hashmap.h"
 
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxApp;
-class WXDLLEXPORT wxKeyEvent;
-class WXDLLEXPORT wxLog;
-class WXDLLEXPORT wxEventLoop;
-class WXDLLEXPORT wxXVisualInfo;
-class wxXVisualInfoMap;
+class WXDLLIMPEXP_FWD_CORE wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxApp;
+class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
+class WXDLLIMPEXP_FWD_BASE wxLog;
+class WXDLLIMPEXP_FWD_CORE wxEventLoop;
+class WXDLLIMPEXP_FWD_CORE wxXVisualInfo;
+class WXDLLIMPEXP_FWD_CORE wxPerDisplayData;
 
 // ----------------------------------------------------------------------------
 // the wxApp class for Motif - see wxAppBase for more details
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxApp : public wxAppBase
+WX_DECLARE_VOIDPTR_HASH_MAP( wxPerDisplayData*, wxPerDisplayDataMap );
+
+class WXDLLIMPEXP_CORE wxApp : public wxAppBase
 {
     DECLARE_DYNAMIC_CLASS(wxApp)
-        
+
 public:
     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 Yield(bool onlyIfNeeded = FALSE);
-    virtual bool ProcessIdle();
-    
-    virtual bool OnInitGui();
-    
+
+    virtual void Exit();
+
+    virtual void WakeUpIdle(); // implemented in motif/evtloop.cpp
+
     // 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);
-    
+
 protected:
     bool                  m_showOnInit;
-    
+
 public:
     // Implementation
-    static bool Initialize();
-    static void CleanUp();
-    
-    void DeletePendingObjects();
-    
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();
+
     // Motif-specific
     WXAppContext   GetAppContext() const { return m_appContext; }
-    WXWidget       GetTopLevelWidget() const { return m_topLevelWidget; }
+    WXWidget       GetTopLevelWidget();
+    WXWidget       GetTopLevelRealizedWidget();
     WXColormap     GetMainColormap(WXDisplay* display);
     WXDisplay*     GetInitialDisplay() const { return m_initialDisplay; }
-    long           GetMaxRequestSize() const { return m_maxRequestSize; }
-    
+
+    void           SetTopLevelWidget(WXDisplay* display, WXWidget widget);
+    void           SetTopLevelRealizedWidget(WXDisplay* display,
+                                             WXWidget widget);
+
     // This handler is called when a property change event occurs
     virtual void   HandlePropertyChange(WXEvent *event);
 
     wxXVisualInfo* GetVisualInfo(WXDisplay* display);
 
 private:
-    static long    sm_lastMessageTime;
-    int            m_nCmdShow;
-
-    wxEventLoop*    m_eventLoop;
-    
     // Motif-specific
     WXAppContext          m_appContext;
-    WXWidget              m_topLevelWidget;
     WXColormap            m_mainColormap;
     WXDisplay*            m_initialDisplay;
-    long                  m_maxRequestSize;
-    wxXVisualInfoMap*     m_visualInfoMap;
-
-    DECLARE_EVENT_TABLE()
+    wxPerDisplayDataMap*  m_perDisplayData;
 };
 
-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
-
 #endif
 // _WX_APP_H_
-