X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9611686694f0449c7f7ced2e0badad9f04a22ea5..e06b0afba5b1acf36241d33982d5d88cccefa2e8:/include/wx/mac/carbon/app.h diff --git a/include/wx/mac/carbon/app.h b/include/wx/mac/carbon/app.h index 492a713004..e44056bd9b 100644 --- a/include/wx/mac/carbon/app.h +++ b/include/wx/mac/carbon/app.h @@ -17,15 +17,11 @@ #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 ; -class WXDLLEXPORT wxKeyEvent; -class WXDLLEXPORT wxLog; +class WXDLLIMPEXP_FWD_CORE wxFrame; +class WXDLLIMPEXP_FWD_CORE wxWindowMac; +class WXDLLIMPEXP_FWD_CORE wxApp ; +class WXDLLIMPEXP_FWD_CORE wxKeyEvent; +class WXDLLIMPEXP_FWD_BASE wxLog; // Force an exit from main loop void WXDLLEXPORT wxExit(); @@ -78,6 +74,7 @@ public: // adding a CFType object to be released only at the end of the current event cycle (increases the // refcount of the object passed), needed in case we are in the middle of an event concering an object // we want to delete and cannot do it immediately + // TODO change semantics to be in line with cocoa (make autrelease NOT increase the count) void MacAddToAutorelease( void* cfrefobj ); public: static wxWindow* s_captureWindow ; @@ -91,9 +88,7 @@ private: WXEVENTHANDLERREF m_macEventHandler ; WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ; WXEVENTREF m_macCurrentEvent ; -#ifdef __WXMAC_OSX__ CFRunLoopSourceRef m_macEventPosted ; -#endif public: static long s_macAboutMenuItemId ; @@ -112,6 +107,7 @@ public: 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 MacHandleAEGURL(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ; virtual short MacHandleAEPDoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ; virtual short MacHandleAEOApp(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ; virtual short MacHandleAEQuit(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ; @@ -119,6 +115,8 @@ public: // in response of an open-document apple event virtual void MacOpenFile(const wxString &fileName) ; + // in response of a get-url apple event + virtual void MacOpenURL(const wxString &url) ; // in response of a print-document apple event virtual void MacPrintFile(const wxString &fileName) ; // in response of a open-application apple event