X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/094637f6d69918150d3dfdb199ad7c92e3189f78..9b1bd0c6e7ed45535fabc574f69b7670fc28191e:/include/wx/gtk/app.h

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 3657155ade..398275be71 100644
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        app.h
+// Name:        wx/gtk/app.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -10,12 +10,10 @@
 #ifndef __GTKAPPH__
 #define __GTKAPPH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
-#include "wx/defs.h"
-#include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/icon.h"
 
@@ -26,37 +24,15 @@
 class wxApp;
 class wxLog;
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern wxApp *wxTheApp;
-
-//-----------------------------------------------------------------------------
-// global functions
-//-----------------------------------------------------------------------------
-
-void wxExit(void);
-bool wxYield(void);
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-#define wxPRINT_WINDOWS         1
-#define wxPRINT_POSTSCRIPT      2
-
 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------
 
 class wxApp: public wxAppBase
 {
-DECLARE_DYNAMIC_CLASS(wxApp)
-
 public:
     wxApp();
-    ~wxApp();
+    virtual ~wxApp();
 
     /* override for altering the way wxGTK intializes the GUI
      * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
@@ -70,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 );
@@ -82,15 +58,13 @@ public:
     static bool InitialzeVisual();
     static void CleanUp();
 
-    bool ProcessIdle();
-#if wxUSE_THREADS
-    void ProcessPendingEvents();
-#endif
     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 IsInAssert() const { return m_isInAssert; }
+#endif // __WXDEBUG__
 
     bool            m_initialized;
 
@@ -100,11 +74,25 @@ 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__
 
+    bool CallInternalIdle( wxWindow* win );
+
+    DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
 };
 
+int WXDLLEXPORT wxEntry( int argc, char *argv[] );
+
 #endif // __GTKAPPH__