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 a2ae48aa1a9e89da70cc08286dc3bb1874fdcbe7..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/??/??


@@ -18,6 +18,7 @@
 
 #include "wx/apptrait.h"
 #include "wx/display.h"
 
 #include "wx/apptrait.h"
 #include "wx/display.h"

+#include "wx/evtloop.h"

 #include "wx/cocoa/private/timer.h"
 
 #include <ctype.h>
 #include "wx/cocoa/private/timer.h"
 
 #include <ctype.h>


@@ -27,6 +28,11 @@
 #include <string.h>
 #include <stdarg.h>
 
 #include <string.h>
 #include <stdarg.h>
 

+#include "wx/cocoa/string.h"
+
+#import <Foundation/NSURL.h>
+#import <AppKit/NSWorkspace.h>
+

 void wxDisplaySize(int *width, int *height)
 {
     // TODO
 void wxDisplaySize(int *width, int *height)
 {
     // TODO


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

+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
+{
+    return new wxGUIEventLoop;
+}
+

 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 {
     return wxGenericFindWindowAtPoint(pt);
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 {
     return wxGenericFindWindowAtPoint(pt);


@@ -97,6 +108,13 @@ void wxBell()
     // TODO
 }
 
     // TODO
 }
 

+// Private helper method for wxLaunchDefaultBrowser
+bool wxDoLaunchDefaultBrowser(const wxString& url, int flags)
+{
+    // NOTE: We ignore the flags
+    return [[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString:wxNSStringWithWxString(url)]] != NO;
+}
+

 #if 0
 // DFE: These aren't even implemented by wxGTK, and no wxWidgets code calls
 // them.  If someone needs them, then they'll get a link error
 #if 0
 // DFE: These aren't even implemented by wxGTK, and no wxWidgets code calls
 // them.  If someone needs them, then they'll get a link error