X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e39af974ef7846e26686ae39d74e4696c1fef0c3..1d54b9d29706dbb43de5624bdf4a2aaa74b2350b:/include/wx/gtk/app.h

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 9b6143d198..d1e6f63ef5 100644
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -10,25 +10,26 @@
 #ifndef __GTKAPPH__
 #define __GTKAPPH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
 #include "wx/frame.h"
 #include "wx/icon.h"
+#include "wx/strconv.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,20 +42,9 @@ 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 void Exit();
-
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual void WakeUpIdle();
 
-    // implementation only from now on
-    void OnIdle( wxIdleEvent &event );
-
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
 
@@ -66,21 +56,19 @@ public:
     bool IsInAssert() const { return m_isInAssert; }
 #endif // __WXDEBUG__
 
-    bool            m_initialized;
-
     gint            m_idleTag;
-#if wxUSE_THREADS
-    gint            m_wakeUpTimerTag;
-#endif
+    void RemoveIdleTag();
+    
     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;
+    // 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
 #ifdef __WXDEBUG__