X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8461e4c253d4cec65e8f0320246a56d22555eb5e..6d99eb3e379fc5cdb835f9a87f92b612ec58dd1c:/include/wx/gtk/app.h

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index e031a2ce9f..3d862eafd4 100644
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -7,28 +7,21 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKAPPH__
-#define __GTKAPPH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/frame.h"
-#include "wx/icon.h"
+#ifndef _WX_GTK_APP_H_
+#define _WX_GTK_APP_H_
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
-class wxApp;
-class wxLog;
+class WXDLLIMPEXP_CORE wxApp;
+class WXDLLIMPEXP_BASE wxLog;
 
 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------
 
-class wxApp: public wxAppBase
+class WXDLLIMPEXP_CORE wxApp: public wxAppBase
 {
 public:
     wxApp();
@@ -41,44 +34,35 @@ 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();
 
 #ifdef __WXDEBUG__
-    virtual void OnAssert(const wxChar *file, int line, const wxChar *msg);
+    virtual void OnAssertFailure(const wxChar *file,
+                                 int line,
+                                 const wxChar *func,
+                                 const wxChar *cond,
+                                 const wxChar *msg);
 
     bool IsInAssert() const { return m_isInAssert; }
 #endif // __WXDEBUG__
 
-    bool            m_initialized;
-
-    gint            m_idleTag;
-#if wxUSE_THREADS
-    gint            m_wakeUpTimerTag;
-#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;
+    guint m_idleTag;
+    // temporarily disable idle events
+    void SuspendIdleCallback();
+
+    // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
+    // selection.
+    void           *m_glVisualInfo; // this is actually an XVisualInfo*
+    void           *m_glFBCInfo; // this is actually an GLXFBConfig*
+    // 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
@@ -90,6 +74,4 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
-
-#endif // __GTKAPPH__
+#endif // _WX_GTK_APP_H_