Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

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

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index db2d753e3d09f93a91f56c5a26021bfd05986ca8..c7c2f39e0e1c542e09af0f2e81ca9b9be42e1d67 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 OnInitGui();
 
     // override base class (pure) virtuals

-    virtual bool Yield(bool onlyIfNeeded = FALSE);

     virtual void WakeUpIdle();
 
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void WakeUpIdle();
 
     virtual bool Initialize(int& argc, wxChar **argv);


@@ -46,18 +45,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;
     void RemoveIdleTag();
 
     unsigned char  *m_colorCube;
 
 
     gint            m_idleTag;
     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*


@@ -67,9 +68,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__

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