added (and documented) trivial but useful IsSingleLine() and IsMultiLine() text contr...

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

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 3e3d10661e01fe49c54055264de12c207f38427e..cdb4c4cb73ed8e229ccdfc52a1f9ae833c16a6b4 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -48,8 +48,6 @@ public:
     virtual void Dispatch();
     virtual bool Yield(bool onlyIfNeeded = FALSE);
 
-    virtual wxIcon GetStdIcon(int which) const;
-
     // implementation only from now on
     void OnIdle( wxIdleEvent &event );
     bool SendIdleEvents();
@@ -63,7 +61,7 @@ public:
     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__
@@ -82,13 +80,15 @@ public:
     // 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__
     bool m_isInAssert;
 #endif // __WXDEBUG__
 
+    bool CallInternalIdle( wxWindow* win );
+
     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
 };