X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dde19c2180ef8d6415af7bb2492bfcb0a2d5c7e4..f6669958924c3c3833e2932b65598b06073d2e65:/include/wx/gtk1/app.h diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h index 273d29eda4..cd279468ff 100644 --- a/include/wx/gtk1/app.h +++ b/include/wx/gtk1/app.h @@ -14,6 +14,8 @@ #include "wx/icon.h" #include "wx/strconv.h" +typedef struct _GdkVisual GdkVisual; + //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- @@ -45,18 +47,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* @@ -66,9 +70,7 @@ public: private: // true if we're inside an assert modal dialog -#ifdef __WXDEBUG__ bool m_isInAssert; -#endif // __WXDEBUG__ DECLARE_DYNAMIC_CLASS(wxApp) };