Applied patch [ 546335 ] Added Automation types and array access

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

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index d10118ecf3199fa8b099c05e04955c62b604c8a7..cdb4c4cb73ed8e229ccdfc52a1f9ae833c16a6b4 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -61,7 +61,7 @@ public:
     void DeletePendingObjects();
 
 #ifdef __WXDEBUG__
     void DeletePendingObjects();
 
 #ifdef __WXDEBUG__

-    virtual void OnAssert(const wxChar *file, int line, const wxChar *msg);
+    virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg);

 
     bool IsInAssert() const { return m_isInAssert; }
 #endif // __WXDEBUG__
 
     bool IsInAssert() const { return m_isInAssert; }
 #endif // __WXDEBUG__


@@ -80,7 +80,7 @@ public:
     // This returns the current visual: either that used by wxRootWindow
     // or the XVisualInfo* for SGI.
     GdkVisual      *GetGdkVisual();
     // This returns the current visual: either that used by wxRootWindow
     // or the XVisualInfo* for SGI.
     GdkVisual      *GetGdkVisual();

-    
+

 private:
     // true if we're inside an assert modal dialog
 #ifdef __WXDEBUG__
 private:
     // true if we're inside an assert modal dialog
 #ifdef __WXDEBUG__


@@ -88,7 +88,7 @@ private:
 #endif // __WXDEBUG__
 
     bool CallInternalIdle( wxWindow* win );
 #endif // __WXDEBUG__
 
     bool CallInternalIdle( wxWindow* win );

-    
+

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