added fix for MSL under Win32 (by Steve Hartwell)

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

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index 29ad141796c561d5e39cab55b4cfcd564cab571a..3fb0e93c8ae191f9a78cc924676116449dab1b56 100644 (file)
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        app.h
+// Name:        wx/gtk/app.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -10,7 +10,7 @@
 #ifndef __GTKAPPH__
 #define __GTKAPPH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -32,7 +32,7 @@ class wxApp: public wxAppBase
 {
 public:
     wxApp();
-    ~wxApp();
+    virtual ~wxApp();
 
     /* override for altering the way wxGTK intializes the GUI
      * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
@@ -41,31 +41,19 @@ public:
     virtual bool OnInitGui();
 
     // 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 void WakeUpIdle();
 
-    virtual wxIcon GetStdIcon(int which) const;
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();
 
-    // implementation only from now on
-    void OnIdle( wxIdleEvent &event );
-    bool SendIdleEvents();
-    bool SendIdleEvents( wxWindow* win );
-
-    static bool Initialize();
     static bool InitialzeVisual();
-    static void CleanUp();
-
-    bool ProcessIdle();
-    void DeletePendingObjects();
 
-    // This can be used to suppress the generation of Idle events.
-    void SuppressIdleEvents(bool arg = TRUE) { m_suppressIdleEvents = arg; }
-    bool GetSuppressIdleEvents() const { return m_suppressIdleEvents; }
+#ifdef __WXDEBUG__
+    virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg);
 
-    bool            m_initialized;
+    bool IsInAssert() const { return m_isInAssert; }
+#endif // __WXDEBUG__
 
     gint            m_idleTag;
 #if wxUSE_THREADS
@@ -73,15 +61,21 @@ public:
 #endif
     unsigned char  *m_colorCube;
 
-private:
-    /// Set to TRUE while we are in wxYield().
-    bool m_suppressIdleEvents;
+    // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
+    // selection; this is actually an XVisualInfo*
+    void           *m_glVisualInfo;
+    // This returns the current visual: either that used by wxRootWindow
+    // or the XVisualInfo* for SGI.
+    GdkVisual      *GetGdkVisual();
 
 private:
+    // true if we're inside an assert modal dialog
+#ifdef __WXDEBUG__
+    bool m_isInAssert;
+#endif // __WXDEBUG__
+
     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
 };
 
-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
-
 #endif // __GTKAPPH__