fix aui crash related to SF bug 1531361

[wxWidgets.git] / include / wx / gtk / app.h

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index c5e991ba0e5c19cf10c102fdf8e334f5293a02eb..dc9d3f50de911f558040840b513a80b53af1d7fd 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -7,12 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKAPPH__
-#define __GTKAPPH__
-
-#include "wx/frame.h"
-#include "wx/icon.h"
-#include "wx/strconv.h"
+#ifndef _WX_GTK_APP_H_
+#define _WX_GTK_APP_H_
 
 //-----------------------------------------------------------------------------
 // classes
@@ -47,15 +43,17 @@ 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;
+    guint m_idleTag;
+    void RemoveIdleSource();
 
     // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
     // selection.
@@ -75,4 +73,4 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#endif // __GTKAPPH__
+#endif // _WX_GTK_APP_H_