Some wxComboCtrlBase member functions were enclosed within incorrect compatibility...

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

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index db2d753e3d09f93a91f56c5a26021bfd05986ca8..ee059e1bee6920cc138dadfcedc3542654a72363 100644 (file)
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -38,7 +38,6 @@ public:
     virtual bool OnInitGui();
 
     // override base class (pure) virtuals
-    virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual void WakeUpIdle();
 
     virtual bool Initialize(int& argc, wxChar **argv);
@@ -46,11 +45,13 @@ 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();
@@ -67,9 +68,7 @@ public:
 
 private:
     // true if we're inside an assert modal dialog
-#ifdef __WXDEBUG__
     bool m_isInAssert;
-#endif // __WXDEBUG__
 
     DECLARE_DYNAMIC_CLASS(wxApp)
 };