Fixed OS/2 compilation problems.

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

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index 7564b247c77028c9354826066e2db34abd88e154..3e3d10661e01fe49c54055264de12c207f38427e 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$
@@ -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
@@ -46,6 +46,7 @@ public:
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
 
     virtual wxIcon GetStdIcon(int which) const;
 
@@ -61,9 +62,11 @@ public:
     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 *msg);
+
+    bool IsInAssert() const { return m_isInAssert; }
+#endif // __WXDEBUG__
 
     bool            m_initialized;
 
@@ -73,13 +76,23 @@ public:
 #endif
     unsigned char  *m_colorCube;
 
+    // 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:
-    /// Set to TRUE while we are in wxYield().
-    bool m_suppressIdleEvents;
+    // true if we're inside an assert modal dialog
+#ifdef __WXDEBUG__
+    bool m_isInAssert;
+#endif // __WXDEBUG__
 
-private:
     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
 };
 
+int WXDLLEXPORT wxEntry( int argc, char *argv[] );
+
 #endif // __GTKAPPH__