X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/413baa20a1d96d2e886bffc0b06ff97f6d8c472b..7c2b7791e5e169ec02e530178aac9a605e2d163e:/include/wx/mac/carbon/app.h diff --git a/include/wx/mac/carbon/app.h b/include/wx/mac/carbon/app.h index f0bf02512e..26c269e1e0 100644 --- a/include/wx/mac/carbon/app.h +++ b/include/wx/mac/carbon/app.h @@ -12,19 +12,13 @@ #ifndef _WX_APP_H_ #define _WX_APP_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "app.h" -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/gdicmn.h" #include "wx/event.h" -#ifdef __DARWIN__ -#include -#else -#include +#ifdef __WXMAC_OSX__ +typedef struct __CFRunLoopSource * CFRunLoopSourceRef; #endif class WXDLLEXPORT wxFrame; @@ -33,11 +27,6 @@ class WXDLLEXPORT wxApp ; class WXDLLEXPORT wxKeyEvent; class WXDLLEXPORT wxLog; -#define wxPRINT_WINDOWS 1 -#define wxPRINT_POSTSCRIPT 2 - -WXDLLEXPORT_DATA(extern wxApp*) wxTheApp; - // Force an exit from main loop void WXDLLEXPORT wxExit(); @@ -53,13 +42,6 @@ class WXDLLEXPORT wxApp: public wxAppBase wxApp(); virtual ~wxApp() {} - virtual int MainLoop(); - virtual void ExitMainLoop(); - virtual bool Pending() ; - virtual bool Dispatch() ; - - virtual void Exit(); - virtual bool Yield(bool onlyIfNeeded = FALSE); virtual void WakeUpIdle(); @@ -75,6 +57,8 @@ class WXDLLEXPORT wxApp: public wxAppBase void OnEndSession(wxCloseEvent& event); void OnQueryEndSession(wxCloseEvent& event); + void MacDoOneEvent() ; + protected: bool m_showOnInit; int m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT @@ -86,8 +70,6 @@ public: virtual bool Initialize(int& argc, wxChar **argv); virtual void CleanUp(); - bool IsExiting() { return !m_keepGoing ; } - // the installed application event handler WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; } WXEVENTHANDLERREF MacGetCurrentEventHandlerCallRef() { return m_macCurrentEventHandlerCallRef ; } @@ -104,14 +86,14 @@ public: int m_nCmdShow; private: - bool m_keepGoing ; - // mac specifics WXEVENTHANDLERREF m_macEventHandler ; WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ; WXEVENTREF m_macCurrentEvent ; +#ifdef __WXMAC_OSX__ CFRunLoopSourceRef m_macEventPosted ; +#endif public: static bool s_macSupportPCMenuShortcuts ; @@ -135,7 +117,6 @@ public: WXHRGN m_macSleepRgn ; WXHRGN m_macHelpRgn ; - void MacDoOneEvent() ; WXEVENTREF MacGetCurrentEvent() { return m_macCurrentEvent ; } void MacHandleOneEvent( WXEVENTREF ev ) ; @@ -144,7 +125,8 @@ public: bool MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) ; bool MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) ; - + bool MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) ; + void MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar ) ; virtual short MacHandleAEODoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ; virtual short MacHandleAEPDoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ; virtual short MacHandleAEOApp(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;