X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/333a0af9f9fb7822e4dba0796fe4a6cf550f7050..1a1498c08b07625baa087622e75637a2f15325b6:/include/wx/mac/carbon/app.h diff --git a/include/wx/mac/carbon/app.h b/include/wx/mac/carbon/app.h index 33db82d82e..4075fe1e00 100644 --- a/include/wx/mac/carbon/app.h +++ b/include/wx/mac/carbon/app.h @@ -12,15 +12,15 @@ #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 __WXMAC_OSX__ +typedef struct __CFRunLoopSource * CFRunLoopSourceRef; +#endif + class WXDLLEXPORT wxFrame; class WXDLLEXPORT wxWindowMac; class WXDLLEXPORT wxApp ; @@ -105,6 +105,9 @@ private: WXEVENTHANDLERREF m_macEventHandler ; WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ; WXEVENTREF m_macCurrentEvent ; +#ifdef __WXMAC_OSX__ + CFRunLoopSourceRef m_macEventPosted ; +#endif public: static bool s_macSupportPCMenuShortcuts ; @@ -123,7 +126,7 @@ public: static long s_macMenuManagerVersion ; static bool s_macHasDialogManager ; static long s_macDialogManagerVersion ; - + WXHRGN m_macCursorRgn ; WXHRGN m_macSleepRgn ; WXHRGN m_macHelpRgn ; @@ -135,8 +138,8 @@ public: // For embedded use. By default does nothing. virtual void MacHandleUnhandledEvent( WXEVENTREF ev ); - bool MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ; - bool MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ; + 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 ) ; virtual short MacHandleAEODoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ; virtual short MacHandleAEPDoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;