X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a5f1fd3e33d25740ad47e4755868c74a58c0f9eb..f114b8580b980c54e7b6194fe6494a86cb833907:/include/wx/gtk1/app.h?ds=sidebyside

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index 6014589623..398275be71 100644
--- 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(__APPLE__)
 #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
@@ -46,8 +46,8 @@ public:
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
-
-    virtual wxIcon GetStdIcon(int which) const;
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
+    virtual bool ProcessIdle();
 
     // implementation only from now on
     void OnIdle( wxIdleEvent &event );
@@ -58,11 +58,10 @@ public:
     static bool InitialzeVisual();
     static void CleanUp();
 
-    bool ProcessIdle();
     void DeletePendingObjects();
 
 #ifdef __WXDEBUG__
-    virtual void OnAssert(const wxChar *file, int line, const wxChar *msg);
+    virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg);
 
     bool IsInAssert() const { return m_isInAssert; }
 #endif // __WXDEBUG__
@@ -75,12 +74,21 @@ 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:
     // true if we're inside an assert modal dialog
 #ifdef __WXDEBUG__
     bool m_isInAssert;
 #endif // __WXDEBUG__
 
+    bool CallInternalIdle( wxWindow* win );
+
     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
 };