X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2478fde622a16d25c66690af353dfdc37e7b582..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/cocoa/app.h?ds=sidebyside

diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index 1e2453a0a5..839a4e012c 100644
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -1,77 +1,74 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/app.h
+// Name:        wx/cocoa/app.h
 // Purpose:     wxApp class
 // 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_
 
-// entrypoint
-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
+typedef struct __CFRunLoopObserver * CFRunLoopObserverRef;
+typedef const struct __CFString * CFStringRef;
 
+#include "wx/osx/core/cfref.h"
+
+// ========================================================================
+// wxApp
+// ========================================================================
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
-class WXDLLEXPORT wxApp: public wxAppBase
+class WXDLLIMPEXP_CORE wxApp: public wxAppBase
 {
     DECLARE_DYNAMIC_CLASS(wxApp)
-    DECLARE_EVENT_TABLE()
 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
 public:
     wxApp();
-    virtual ~wxApp() {}
+    virtual ~wxApp();
 
 // ------------------------------------------------------------------------
 // Cocoa specifics
 // ------------------------------------------------------------------------
 public:
     inline WX_NSApplication GetNSApplication() { return m_cocoaApp; }
-    void CocoaInstallRequestedIdleHandler() { if(m_isIdle) CocoaInstallIdleHandler(); }
-    inline void CocoaRequestIdle() { m_isIdle = true; }
+    virtual void CocoaDelegate_applicationWillBecomeActive();
+    virtual void CocoaDelegate_applicationDidBecomeActive();
+    virtual void CocoaDelegate_applicationWillResignActive();
+    virtual void CocoaDelegate_applicationDidResignActive();
+    virtual void CocoaDelegate_applicationWillUpdate();
+    virtual void CF_ObserveMainRunLoopBeforeWaiting(CFRunLoopObserverRef observer, int activity);
 protected:
     WX_NSApplication m_cocoaApp;
-    void CocoaInstallIdleHandler();
-    bool m_isIdle;
+    struct objc_object *m_cocoaAppDelegate;
+    WX_NSThread m_cocoaMainThread;
+    wxCFRef<CFRunLoopObserverRef> m_cfRunLoopIdleObserver;
+    wxCFRef<CFStringRef> m_cfObservedRunLoopMode;
 
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 public:
     // Implement wxAppBase pure virtuals
-    virtual int MainLoop();
-    virtual void ExitMainLoop();
-    virtual bool Initialized();
-    virtual bool Pending();
-    virtual void Dispatch();
-
     virtual void Exit();
 
-    virtual bool Yield(bool onlyIfNeeded = FALSE);
-    virtual bool ProcessIdle();
-    virtual bool 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);
-    
-    static bool Initialize();
-    static void CleanUp();
-    
+    virtual void WakeUpIdle();
+
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();
+    virtual bool CallOnInit();
+
+
     virtual bool OnInit();
     virtual bool OnInitGui();
-    void DeletePendingObjects();
+
+    // Set true _before_ initializing wx to force embedded mode (no app delegate, etc.)
+    static bool sm_isEmbedded;
 };
 
 #endif // _WX_COCOA_APP_H_