X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b181f9a5806b831d8c038648642c9a815af52081..739c5499fcab1c165b8dd0591c9fd9e2329b3cf9:/src/cocoa/utils.mm?ds=sidebyside diff --git a/src/cocoa/utils.mm b/src/cocoa/utils.mm index c6958cfa43..bc764949b5 100644 --- a/src/cocoa/utils.mm +++ b/src/cocoa/utils.mm @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/cocoa/utils.cpp +// Name: src/cocoa/utils.mm // Purpose: Various utilities // Author: David Elliott // Created: 2003/??/?? @@ -73,12 +73,9 @@ wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer* timer) return new wxCocoaTimerImpl(timer); } -wxEventLoop* wxGUIAppTraits::CreateEventLoop() +wxEventLoopBase* wxGUIAppTraits::CreateEventLoop() { - // MAJOR HACK: wxEventLoop is implemented in both core and base libraries. - // Fortunately, it has an empty implementation so an instance of the - // wxGUIEventLoop parent class will be fine until this issue is fixed. - return static_cast(new wxGUIEventLoop); + return new wxGUIEventLoop; } wxWindow* wxFindWindowAtPoint(const wxPoint& pt) @@ -112,7 +109,7 @@ void wxBell() } // Private helper method for wxLaunchDefaultBrowser -bool wxCocoaLaunchDefaultBrowser(const wxString& url, int flags) +bool wxDoLaunchDefaultBrowser(const wxString& url, int flags) { // NOTE: We ignore the flags return [[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString:wxNSStringWithWxString(url)]] != NO;