added GetBaseClassName1 and 2 for memory.cpp compiles

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

diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index 02bf4fa5b0776f07667f2e3164ba1ac3cd2286b3..c658fbb3ae677f1ff13a6d2d9a2920a624beeeab 100644 (file)
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -34,6 +34,7 @@ public:
     inline void CocoaRequestIdle() { m_isIdle = true; }
 protected:
     WX_NSApplication m_cocoaApp;
+    WX_NSThread m_cocoaMainThread;
     void CocoaInstallIdleHandler();
     bool m_isIdle;
 
@@ -53,9 +54,6 @@ public:
     virtual bool Yield(bool onlyIfNeeded = FALSE);
     virtual void WakeUpIdle() { CocoaRequestIdle(); }
     
-    /* Idle Processing */
-    void OnIdle(wxIdleEvent& event);
-
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
     virtual bool CallOnInit();
@@ -63,6 +61,16 @@ public:
     
     virtual bool OnInit();
     virtual bool OnInitGui();
+
+#ifdef __WXDEBUG__
+    virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg);
+    bool IsInAssert() const { return m_isInAssert; }
+#endif // __WXDEBUG__
+
+private:
+#ifdef __WXDEBUG__
+    bool m_isInAssert;
+#endif // __WXDEBUG__
 };
 
 #endif // _WX_COCOA_APP_H_