Fix history in wxWebViewIE when using a custom file scheme.

[wxWidgets.git] / src / osx / utils_osx.cpp

diff --git a/src/osx/utils_osx.cpp b/src/osx/utils_osx.cpp
index 4764ec07a06ab6fc2497d155ba5ef70ed591690f..251332d88cb70d2f1f1d0b7cf2fa4d324c94c295 100644 (file)
--- a/src/osx/utils_osx.cpp
+++ b/src/osx/utils_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id: utils.cpp 54886 2008-07-31 13:02:53Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -61,21 +61,10 @@ bool wxCheckForInterrupt(wxWindow *WXUNUSED(wnd))
 // Return true if we have a colour display
 bool wxColourDisplay()
 {
 // Return true if we have a colour display
 bool wxColourDisplay()
 {

+    // always the case on OS X

     return true;
 }
 
     return true;
 }
 

-#if wxUSE_BASE
-
-void wxMacWakeUp()
-{
-    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
-
-    if ( loop )
-        loop->WakeUp();
-}
-
-#endif
-

 #if wxOSX_USE_COCOA_OR_CARBON
 // Returns depth of screen
 int wxDisplayDepth()
 #if wxOSX_USE_COCOA_OR_CARBON
 // Returns depth of screen
 int wxDisplayDepth()


@@ -109,7 +98,7 @@ bool wxLaunchDefaultApplication(const wxString& document, int flags)
     CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
     wxCFRef<CFURLRef> curl(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kCFURLPOSIXPathStyle, false));
     OSStatus err = LSOpenCFURLRef( curl , NULL );
     CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
     wxCFRef<CFURLRef> curl(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kCFURLPOSIXPathStyle, false));
     OSStatus err = LSOpenCFURLRef( curl , NULL );

-    
+

     if (err == noErr)
     {
         return true;
     if (err == noErr)
     {
         return true;