Avoid crash during global destruction.

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

diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index f262298f2f0f6f58c299a2f86919b1bafae5a877..a0d914b1dfd22c91932a795895e0409e3848a546 100644 (file)
--- 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"
 
 // ----------------------------------------------------------------------------
@@ -32,6 +31,9 @@ class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxApp;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
+class WXDLLEXPORT wxEventLoop;
+class WXDLLEXPORT wxXVisualInfo;
+class wxXVisualInfoMap;
 
 // ----------------------------------------------------------------------------
 // the wxApp class for Motif - see wxAppBase for more details
@@ -39,86 +41,73 @@ 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 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);
-
-    // Returns TRUE if a key up event has been processed
-    virtual bool CheckForKeyUp(WXEvent* event);
-
+    
 protected:
     bool                  m_showOnInit;
-
+    
 public:
     // Implementation
     static bool Initialize();
     static void CleanUp();
-
+    
     void DeletePendingObjects();
-    bool ProcessIdle();
-
+    
     // Motif-specific
     WXAppContext   GetAppContext() const { return m_appContext; }
     WXWidget       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:
+    wxXVisualInfo* GetVisualInfo(WXDisplay* display);
+
+private:
     static long    sm_lastMessageTime;
     int            m_nCmdShow;
 
-protected:
-    bool                  m_keepGoing;
-
+    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()
 };
@@ -126,5 +115,5 @@ protected:
 int WXDLLEXPORT wxEntry( int argc, char *argv[] );
 
 #endif
-    // _WX_APP_H_
+// _WX_APP_H_