X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/955a919785b76a1826e6b8d55f696a0dfb62a318..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk1/app.h diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h index fc603dafb7..db2d753e3d 100644 --- a/include/wx/gtk1/app.h +++ b/include/wx/gtk1/app.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/app.h +// Name: wx/gtk1/app.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,25 +10,22 @@ #ifndef __GTKAPPH__ #define __GTKAPPH__ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface -#endif - #include "wx/frame.h" #include "wx/icon.h" +#include "wx/strconv.h" //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- -class wxApp; -class wxLog; +class WXDLLIMPEXP_FWD_CORE wxApp; +class WXDLLIMPEXP_FWD_BASE wxLog; //----------------------------------------------------------------------------- // wxApp //----------------------------------------------------------------------------- -class wxApp: public wxAppBase +class WXDLLIMPEXP_CORE wxApp: public wxAppBase { public: wxApp(); @@ -41,14 +38,6 @@ 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(); @@ -63,17 +52,15 @@ 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(); @@ -85,7 +72,6 @@ private: #endif // __WXDEBUG__ DECLARE_DYNAMIC_CLASS(wxApp) - DECLARE_EVENT_TABLE() }; #endif // __GTKAPPH__