X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34a34b020f1c8defacb299a0fa5c480fa65b8597..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/gtk1/app.h?ds=inline diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h index d4671dd320..c8b7dc8a97 100644 --- a/include/wx/gtk1/app.h +++ b/include/wx/gtk1/app.h @@ -1,8 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/app.h +// Name: wx/gtk1/app.h // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling, Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -10,25 +9,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,7 +39,6 @@ public: virtual bool OnInitGui(); // override base class (pure) virtuals - virtual bool Yield(bool onlyIfNeeded = FALSE); virtual void WakeUpIdle(); virtual bool Initialize(int& argc, wxChar **argv); @@ -49,18 +46,20 @@ 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; + int m_idleTag; void RemoveIdleTag(); - + unsigned char *m_colorCube; - // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual + // 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* @@ -70,12 +69,9 @@ public: 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__