X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/047c1182f94ca7941b08170cddbb5880f1023055..be19c556083cc197be55acbd05db76ec6dc2e0c4:/include/wx/cocoa/app.h diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h index 4c44be6a8e..839a4e012c 100644 --- a/include/wx/cocoa/app.h +++ b/include/wx/cocoa/app.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/app.h +// Name: wx/cocoa/app.h // Purpose: wxApp class // Author: David Elliott // Modified by: @@ -15,17 +15,16 @@ typedef struct __CFRunLoopObserver * CFRunLoopObserverRef; typedef const struct __CFString * CFStringRef; -#include "wx/mac/corefoundation/cfref.h" +#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 // ------------------------------------------------------------------------ @@ -58,26 +57,18 @@ public: // Implement wxAppBase pure virtuals virtual void Exit(); - virtual bool Yield(bool onlyIfNeeded = FALSE); virtual void WakeUpIdle(); - + 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__ + // Set true _before_ initializing wx to force embedded mode (no app delegate, etc.) + static bool sm_isEmbedded; }; #endif // _WX_COCOA_APP_H_