Add missing wxUSE_OLE checks to safearray.cpp.

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

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index 32ef7416a0b2817300506f9e572b80ed730279aa..cd279468ff795cdd5a062732f0f734c72eac73b9 100644 (file)
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -14,6 +14,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 +47,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,11 +70,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__
-
-    virtual bool DoYield(bool onlyIfNeeded, long eventsToProcess);

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