X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/87d77923a6b62816336e53abd4217a119f14675d..3684ade82ec6f5fb7ff72341e26060b6ea0793c8:/include/wx/cocoa/app.h

diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index 7e1a3d832d..d114405049 100644
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -4,14 +4,17 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/11/27
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_APP_H_
 #define _WX_COCOA_APP_H_
 
+// ========================================================================
+// wxApp
+// ========================================================================
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 class WXDLLEXPORT wxApp: public wxAppBase
@@ -34,6 +37,7 @@ public:
     inline void CocoaRequestIdle() { m_isIdle = true; }
 protected:
     WX_NSApplication m_cocoaApp;
+    WX_NSThread m_cocoaMainThread;
     void CocoaInstallIdleHandler();
     bool m_isIdle;
 
@@ -46,28 +50,30 @@ public:
     virtual void ExitMainLoop();
     virtual bool Initialized();
     virtual bool Pending();
-    virtual void Dispatch();
+    virtual bool Dispatch();
 
     virtual void Exit();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
-    virtual bool ProcessIdle();
     virtual void WakeUpIdle() { CocoaRequestIdle(); }
     
-    /* Idle Processing */
-    void OnIdle(wxIdleEvent& event);
-    // Send idle event to all top-level windows.
-    // Returns TRUE if more idle time is requested.
-    bool SendIdleEvents();
-    // Send idle event to window and all subwindows
-    // Returns TRUE if more idle time is requested.
-    bool SendIdleEvents(wxWindowCocoa* win);
-    
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
+    virtual bool CallOnInit();
+
     
     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_