Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

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

diff --git a/src/cocoa/utils.mm b/src/cocoa/utils.mm
index f4acf49cb8b0072d6d0b3ee5f4957937b7571607..1388b29c1e7ef26651a06b8de3dba845b2b71e84 100644 (file)
--- a/src/cocoa/utils.mm
+++ b/src/cocoa/utils.mm
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

-// RCS-ID:      $Id$

 // Copyright:   (c) wxWidgets dev team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) wxWidgets dev team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -18,6 +17,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>


@@ -72,6 +72,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);


@@ -103,7 +108,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;