cleaning up common OSX code

[wxWidgets.git] / src / common / utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 2beddfe3a627da816aabcfca23474c2a3048c080..c3b7898538ff7c11a7f5685f1c1787e4d1932e14 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -75,11 +75,13 @@
     #include "wx/statusbr.h"
 #endif // wxUSE_GUI
 
     #include "wx/statusbr.h"
 #endif // wxUSE_GUI
 

+#ifndef __WXPALMOS5__

 #ifndef __WXWINCE__
 #include <time.h>
 #else
 #include "wx/msw/wince/time.h"
 #endif
 #ifndef __WXWINCE__
 #include <time.h>
 #else
 #include "wx/msw/wince/time.h"
 #endif

+#endif // ! __WXPALMOS5__

 
 #ifdef __WXMAC__
 #include "wx/mac/private.h"
 
 #ifdef __WXMAC__
 #include "wx/mac/private.h"


@@ -88,10 +90,12 @@
 #endif
 #endif
 
 #endif
 #endif
 

+#ifndef __WXPALMOS5__

 #if !defined(__MWERKS__) && !defined(__WXWINCE__)
     #include <sys/types.h>
     #include <sys/stat.h>
 #endif
 #if !defined(__MWERKS__) && !defined(__WXWINCE__)
     #include <sys/types.h>
     #include <sys/stat.h>
 #endif

+#endif // ! __WXPALMOS5__

 
 #if defined(__WXMSW__)
     #include "wx/msw/private.h"
 
 #if defined(__WXMSW__)
     #include "wx/msw/private.h"


@@ -1033,7 +1037,7 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
 
     ::ShellExecuteEx(&sei);
 
 
     ::ShellExecuteEx(&sei);
 

-    const int nResult = (int) sei.hInstApp;
+    const INT_PTR nResult = (INT_PTR)sei.hInstApp;

 
     // Firefox returns file not found for some reason, so make an exception
     // for it
 
     // Firefox returns file not found for some reason, so make an exception
     // for it


@@ -1081,6 +1085,20 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
 
 #ifdef __UNIX__
 
 
 #ifdef __UNIX__
 

+    // Our best best is to use xdg-open from freedesktop.org cross-desktop
+    // compatibility suite xdg-utils
+    // (see http://portland.freedesktop.org/wiki/) -- this is installed on
+    // most modern distributions and may be tweaked by them to handle
+    // distribution specifics. Only if that fails, try to find the right
+    // browser ourselves.
+    wxString path, xdg_open;
+    if ( wxGetEnv("PATH", &path) &&
+         wxFindFileInPath(&xdg_open, path, "xdg-open") )
+    {
+        if ( wxExecute(xdg_open + " " + url) )
+            return true;
+    }
+

     wxString desktop = wxTheApp->GetTraits()->GetDesktopEnvironment();
 
     // GNOME and KDE desktops have some applications which should be always installed
     wxString desktop = wxTheApp->GetTraits()->GetDesktopEnvironment();
 
     // GNOME and KDE desktops have some applications which should be always installed