Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

[wxWidgets.git] / src / cocoa / utils.mm

diff --git a/src/cocoa/utils.mm b/src/cocoa/utils.mm
index ea89c852cc8e837444e8d51e0dd400240212975c..bc764949b5b94fe71653c4734765f312e593975b 100644 (file)
--- 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/??/??
 // Purpose:     Various utilities
 // Author:      David Elliott
 // Created:     2003/??/??


@@ -73,9 +73,9 @@ wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer* timer)
     return new wxCocoaTimerImpl(timer);
 }
 
     return new wxCocoaTimerImpl(timer);
 }
 

-wxEventLoop* wxGUIAppTraits::CreateEventLoop()
+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()

 {
 {

-       return new wxEventLoop;
+    return new wxGUIEventLoop;

 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)


@@ -109,7 +109,7 @@ void wxBell()
 }
 
 // Private helper method for wxLaunchDefaultBrowser
 }
 
 // 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;
 {
     // NOTE: We ignore the flags
     return [[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString:wxNSStringWithWxString(url)]] != NO;