X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb896a322a2ed53d393ee738765ddd3f72cee004..d139c3a84be966e6989b35ed6fc31e2580352c2b:/include/wx/cocoa/app.h

diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index 9d4f65acd3..c658fbb3ae 100644
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -12,9 +12,6 @@
 #ifndef _WX_COCOA_APP_H_
 #define _WX_COCOA_APP_H_
 
-// entrypoint
-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
-
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 class WXDLLEXPORT wxApp: public wxAppBase
@@ -37,6 +34,7 @@ public:
     inline void CocoaRequestIdle() { m_isIdle = true; }
 protected:
     WX_NSApplication m_cocoaApp;
+    WX_NSThread m_cocoaMainThread;
     void CocoaInstallIdleHandler();
     bool m_isIdle;
 
@@ -50,24 +48,29 @@ public:
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
+
+    virtual void Exit();
+
     virtual bool Yield(bool onlyIfNeeded = FALSE);
-    virtual bool ProcessIdle();
-    
-    /* 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 void WakeUpIdle() { CocoaRequestIdle(); }
     
-    static bool Initialize();
-    static void CleanUp();
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();
+    virtual bool CallOnInit();
+
     
     virtual bool OnInit();
     virtual bool OnInitGui();
-    void DeletePendingObjects();
+
+#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_