X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ef94bfc25eb21f1d3fa93b3d55c5a1ca18d8e62..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/gtk1/app.h diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h index 27c5e7faaf..c7c2f39e0e 100644 --- a/include/wx/gtk1/app.h +++ b/include/wx/gtk1/app.h @@ -18,8 +18,8 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxApp; -class WXDLLIMPEXP_BASE wxLog; +class WXDLLIMPEXP_FWD_CORE wxApp; +class WXDLLIMPEXP_FWD_BASE wxLog; //----------------------------------------------------------------------------- // wxApp @@ -38,7 +38,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); @@ -46,18 +45,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; 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* @@ -67,12 +68,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__