Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

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

diff --git a/src/osx/utils_osx.cpp b/src/osx/utils_osx.cpp
index 6318dd92eb409d43cf1d70123ac2051cc7dfba79..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
 /////////////////////////////////////////////////////////////////////////////


@@ -40,12 +40,6 @@
 #endif
 
 #include "wx/osx/private.h"
 #endif
 
 #include "wx/osx/private.h"

-
-#ifdef wxOSX_USE_COCOA
-// to get the themeing APIs
-#include <Carbon/Carbon.h>
-#endif
-

 #include "wx/osx/private/timer.h"
 
 #include "wx/evtloop.h"
 #include "wx/osx/private/timer.h"
 
 #include "wx/evtloop.h"


@@ -67,6 +61,7 @@ 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;
 }
 


@@ -99,12 +94,20 @@ bool wxLaunchDefaultApplication(const wxString& document, int flags)
 {
     wxUnusedVar(flags);
 
 {
     wxUnusedVar(flags);
 

-    static const char * const OPEN_CMD = "/usr/bin/open";
-    if ( wxFileExists(OPEN_CMD) &&
-            wxExecute(wxString(OPEN_CMD) + " " + document) )
-        return true;
+    wxCFRef<CFMutableStringRef> cfMutableString(CFStringCreateMutableCopy(NULL, 0, wxCFStringRef(document)));
+    CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
+    wxCFRef<CFURLRef> curl(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kCFURLPOSIXPathStyle, false));
+    OSStatus err = LSOpenCFURLRef( curl , NULL );

 
 

-    return false;
+    if (err == noErr)
+    {
+        return true;
+    }
+    else
+    {
+        wxLogDebug(wxT("Default Application Launch error %d"), (int) err);
+        return false;
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -160,9 +163,30 @@ wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
     return new wxEventLoop;
 }
 
     return new wxEventLoop;
 }
 

+wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt);
+

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

-    return wxGenericFindWindowAtPoint(pt);
+#if wxOSX_USE_CARBON
+
+    Point screenPoint = { pt.y , pt.x };
+    WindowRef windowRef;
+
+    if ( FindWindow( screenPoint , &windowRef ) )
+    {
+        wxNonOwnedWindow *nonOwned = wxNonOwnedWindow::GetFromWXWindow( windowRef );
+
+        if ( nonOwned )
+            return wxFindWindowAtPoint( nonOwned , pt );
+    }
+
+    return NULL;
+
+#else
+
+    return wxGenericFindWindowAtPoint( pt );
+
+#endif

 }
 
 /*
 }
 
 /*