Unix compilation fixes after last commit

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index c0d7e529c8f6a2c36421e8c99e1841b373cb9585..fdda0694d9103064310b468187270e78be9f88ed 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -62,7 +62,7 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-#if !defined(__WATCOMC__)
+#if !wxONLY_WATCOM_EARLIER_THAN(1,4)

     #if !(defined(_MSC_VER) && (_MSC_VER > 800))
         #include <errno.h>
     #endif
     #if !(defined(_MSC_VER) && (_MSC_VER > 800))
         #include <errno.h>
     #endif


@@ -621,9 +621,10 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
     SInt32 endSel;
 
     err = ICStart(&inst, 'STKA'); // put your app creator code here
     SInt32 endSel;
 
     err = ICStart(&inst, 'STKA'); // put your app creator code here

-    if (err == noErr) {
+    if (err == noErr)
+    {

 #if !TARGET_CARBON
 #if !TARGET_CARBON

-        err = ICFindConfigFile(inst, 0, nil);
+        err = ICFindConfigFile(inst, 0, NULL);

 #endif
         if (err == noErr)
         {
 #endif
         if (err == noErr)
         {


@@ -644,31 +645,34 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
     }
 #elif wxUSE_MIMETYPE
     // Non-windows way
     }
 #elif wxUSE_MIMETYPE
     // Non-windows way

-    wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension (_T("html"));
+    bool ok = false;
+    wxString cmd;
+
+    wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("html"));

     if ( ft )
     {
         wxString mt;
         ft->GetMimeType(&mt);
 
     if ( ft )
     {
         wxString mt;
         ft->GetMimeType(&mt);
 

-        wxString cmd;
-        bool ok = ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(url));
+        ok = ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(url));

         delete ft;
         delete ft;

-
-        if ( !ok || cmd.empty() )
-        {
-            // fallback to checking for the BROWSER environment variable
-            cmd = wxGetenv(wxT("BROWSER"));
-            if ( !cmd.empty() )
-                cmd << _T(' ') << url;
-        }
-
-        if ( !cmd.empty() && wxExecute(cmd) )
-            return true;

     }
     }

-    else // no file type for html extension
+
+    if ( !ok || cmd.empty() )

     {
     {

-        wxLogError(_T("No default application configured for HTML files."));
+        // fallback to checking for the BROWSER environment variable
+        cmd = wxGetenv(wxT("BROWSER"));
+        if ( !cmd.empty() )
+            cmd << _T(' ') << url;

     }
     }

+
+    ok = ( !cmd.empty() && wxExecute(cmd) );
+    if (ok)
+        return ok;
+
+    // no file type for HTML extension
+    wxLogError(_T("No default application configured for HTML files."));
+

 #endif // !wxUSE_MIMETYPE && !__WXMSW__
 
     wxLogSysError(_T("Failed to open URL \"%s\" in default browser."),
 #endif // !wxUSE_MIMETYPE && !__WXMSW__
 
     wxLogSysError(_T("Failed to open URL \"%s\" in default browser."),