X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eb537cfb1cc0066c0d53a2415972afa6e303c4b5..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/cocoa/app.h diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h index d0e7c78261..50900b4f18 100644 --- a/include/wx/cocoa/app.h +++ b/include/wx/cocoa/app.h @@ -12,6 +12,11 @@ #ifndef _WX_COCOA_APP_H_ #define _WX_COCOA_APP_H_ +typedef struct __CFRunLoopObserver * CFRunLoopObserverRef; +typedef const struct __CFString * CFStringRef; + +#include "wx/mac/corefoundation/cfref.h" + // ======================================================================== // wxApp // ======================================================================== @@ -20,13 +25,12 @@ class WXDLLEXPORT wxApp: public wxAppBase { DECLARE_DYNAMIC_CLASS(wxApp) - DECLARE_EVENT_TABLE() // ------------------------------------------------------------------------ // initialization // ------------------------------------------------------------------------ public: wxApp(); - virtual ~wxApp() {} + virtual ~wxApp(); // ------------------------------------------------------------------------ // Cocoa specifics @@ -37,10 +41,14 @@ public: 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; struct objc_object *m_cocoaAppDelegate; WX_NSThread m_cocoaMainThread; + wxCFRef m_cfRunLoopIdleObserver; + wxCFRef m_cfObservedRunLoopMode; // ------------------------------------------------------------------------ // Implementation @@ -65,6 +73,8 @@ public: bool IsInAssert() const { return m_isInAssert; } #endif // __WXDEBUG__ + // Set true _before_ initializing wx to force embedded mode (no app delegate, etc.) + static bool sm_isEmbedded; private: #ifdef __WXDEBUG__ bool m_isInAssert;