Applied patch [ 597398 ] Generic MDI, wxNotebook based.

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

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index e031a2ce9f57e48fa50487b2c2887a13fed79fc8..3beaf8806b37a9cf5181b87381f98d2e8a07a608 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -47,8 +47,7 @@ public:
     virtual bool Pending();
     virtual void Dispatch();
     virtual bool Yield(bool onlyIfNeeded = FALSE);
-
-    virtual wxIcon GetStdIcon(int which) const;
+    virtual bool ProcessIdle();
 
     // implementation only from now on
     void OnIdle( wxIdleEvent &event );
@@ -59,11 +58,10 @@ public:
     static bool InitialzeVisual();
     static void CleanUp();
 
-    bool ProcessIdle();
     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__
@@ -76,16 +74,21 @@ public:
 #endif
     unsigned char  *m_colorCube;
 
-    // used by the the wxGLApp and wxGLCanvas class for GL-based X visual 
+    // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
     // selection; this is actually an XVisualInfo*
     void           *m_glVisualInfo;
-    
+    // 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()
 };