Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index 273d29eda4bca58d5d88982ac71edf2d888c6386..c8b7dc8a97eaffc63e65c0074579dbf80d9af5d6 100644 (file)
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -2,7 +2,6 @@
 // Name:        wx/gtk1/app.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        wx/gtk1/app.h
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -14,6 +13,8 @@
 #include "wx/icon.h"
 #include "wx/strconv.h"
 
 #include "wx/icon.h"
 #include "wx/strconv.h"
 

+typedef struct _GdkVisual GdkVisual;
+

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------


@@ -45,18 +46,20 @@ public:
 
     static bool InitialzeVisual();
 
 
     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; }
 
     bool IsInAssert() const { return m_isInAssert; }

-#endif // __WXDEBUG__

 
 

-    gint            m_idleTag;
+    int             m_idleTag;

     void RemoveIdleTag();
 
     unsigned char  *m_colorCube;
 
     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*
     // selection.
     void           *m_glVisualInfo; // this is actually an XVisualInfo*
     void           *m_glFBCInfo; // this is actually an GLXFBConfig*


@@ -66,9 +69,7 @@ public:
 
 private:
     // true if we're inside an assert modal dialog
 
 private:
     // true if we're inside an assert modal dialog

-#ifdef __WXDEBUG__

     bool m_isInAssert;
     bool m_isInAssert;

-#endif // __WXDEBUG__

 
     DECLARE_DYNAMIC_CLASS(wxApp)
 };
 
     DECLARE_DYNAMIC_CLASS(wxApp)
 };