X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd435a79ed2c79e20621fbe6b1013a86a9e05fed..49a63afbad7646668df343d29edd88458bc7e0a9:/include/wx/gtk1/app.h diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h index 834aaa338e..cd279468ff 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,24 @@ #ifndef __GTKAPPH__ #define __GTKAPPH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - #include "wx/frame.h" #include "wx/icon.h" +#include "wx/strconv.h" + +typedef struct _GdkVisual GdkVisual; //----------------------------------------------------------------------------- // 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,9 +40,6 @@ public: virtual bool OnInitGui(); // override base class (pure) virtuals - virtual bool Initialized(); - - virtual bool Yield(bool onlyIfNeeded = FALSE); virtual void WakeUpIdle(); virtual bool Initialize(int& argc, wxChar **argv); @@ -51,33 +47,32 @@ public: static bool InitialzeVisual(); -#ifdef __WXDEBUG__ - virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, 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__ - gint m_idleTag; -#if wxUSE_THREADS - gint m_wakeUpTimerTag; -#endif + int m_idleTag; + 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; + // Used by 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 -#ifdef __WXDEBUG__ bool m_isInAssert; -#endif // __WXDEBUG__ DECLARE_DYNAMIC_CLASS(wxApp) - DECLARE_EVENT_TABLE() }; #endif // __GTKAPPH__