Two corrections to const fix

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index d79d79f54c4244a93399e4dbb99afa1a1d96baf3..e259d39066c22aa29441782a1c1c4b705319b561 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utilscmn.cpp
+// Name:        src/common/utilscmn.cpp

 // Purpose:     Miscellaneous utility functions and classes
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Miscellaneous utility functions and classes
 // Author:      Julian Smart
 // Modified by:


@@ -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


@@ -82,6 +82,13 @@
 #include "wx/msw/wince/time.h"
 #endif
 
 #include "wx/msw/wince/time.h"
 #endif
 

+#ifdef __WXMAC__
+#include "wx/mac/private.h"
+#ifndef __DARWIN__
+#include "InternetConfig.h"
+#endif
+#endif
+

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


@@ -89,6 +96,7 @@
 
 #if defined(__WXMSW__)
     #include "wx/msw/private.h"
 
 #if defined(__WXMSW__)
     #include "wx/msw/private.h"

+    #include "wx/msw/registry.h"

 #endif
 
 #if wxUSE_BASE
 #endif
 
 #if wxUSE_BASE


@@ -97,11 +105,6 @@
 // common data
 // ----------------------------------------------------------------------------
 
 // common data
 // ----------------------------------------------------------------------------
 

-#if WXWIN_COMPATIBILITY_2_2
-    const wxChar *wxInternalErrorStr = wxT("wxWidgets Internal Error");
-    const wxChar *wxFatalErrorStr = wxT("wxWidgets Fatal Error");
-#endif // WXWIN_COMPATIBILITY_2_2
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -530,6 +533,8 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
         url.Prepend(wxT("http://"));
 
 #if defined(__WXMSW__)
         url.Prepend(wxT("http://"));
 
 #if defined(__WXMSW__)

+
+#if wxUSE_IPC

     if ( flags & wxBROWSER_NEW_WINDOW )
     {
         // ShellExecuteEx() opens the URL in an existing window by default so
     if ( flags & wxBROWSER_NEW_WINDOW )
     {
         // ShellExecuteEx() opens the URL in an existing window by default so


@@ -587,6 +592,7 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
             }
         }
     }
             }
         }
     }

+#endif // wxUSE_IPC

 
     WinStruct<SHELLEXECUTEINFO> sei;
     sei.lpFile = url.c_str();
 
     WinStruct<SHELLEXECUTEINFO> sei;
     sei.lpFile = url.c_str();


@@ -608,6 +614,34 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
 #endif // __WXDEBUG__
         return true;
     }
 #endif // __WXDEBUG__
         return true;
     }

+#elif defined(__WXMAC__)
+    OSStatus err;
+    ICInstance inst;
+    SInt32 startSel;
+    SInt32 endSel;
+
+    err = ICStart(&inst, 'STKA'); // put your app creator code here
+    if (err == noErr) {
+#if !TARGET_CARBON
+        err = ICFindConfigFile(inst, 0, nil);
+#endif
+        if (err == noErr)
+        {
+            ConstStr255Param hint = 0;
+            startSel = 0;
+            endSel = url.Length();
+            err = ICLaunchURL(inst, hint, url.fn_str(), endSel, &startSel, &endSel);
+            if (err != noErr)
+                wxLogDebug(wxT("ICLaunchURL error %d"), (int) err);
+        }
+        ICStop(inst);
+        return true;
+    }
+    else
+    {
+        wxLogDebug(wxT("ICStart error %d"), (int) err);
+        return false;
+    }

 #elif wxUSE_MIMETYPE
     // Non-windows way
     wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension (_T("html"));
 #elif wxUSE_MIMETYPE
     // Non-windows way
     wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension (_T("html"));


@@ -955,7 +989,7 @@ wxString wxGetPasswordFromUser(const wxString& message,
 
 #if wxUSE_COLOURDLG
 
 
 #if wxUSE_COLOURDLG
 

-wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
+wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit, const wxString& caption)

 {
     wxColourData data;
     data.SetChooseFull(true);
 {
     wxColourData data;
     data.SetChooseFull(true);


@@ -966,6 +1000,8 @@ wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
 
     wxColour colRet;
     wxColourDialog dialog(parent, &data);
 
     wxColour colRet;
     wxColourDialog dialog(parent, &data);

+    if (!caption.IsEmpty())
+        dialog.SetTitle(caption);

     if ( dialog.ShowModal() == wxID_OK )
     {
         colRet = dialog.GetColourData().GetColour();
     if ( dialog.ShowModal() == wxID_OK )
     {
         colRet = dialog.GetColourData().GetColour();


@@ -979,7 +1015,7 @@ wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
 
 #if wxUSE_FONTDLG
 
 
 #if wxUSE_FONTDLG
 

-wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit)
+wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption)

 {
     wxFontData data;
     if ( fontInit.Ok() )
 {
     wxFontData data;
     if ( fontInit.Ok() )


@@ -989,6 +1025,8 @@ wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit)
 
     wxFont fontRet;
     wxFontDialog dialog(parent, data);
 
     wxFont fontRet;
     wxFontDialog dialog(parent, data);

+    if (!caption.IsEmpty())
+        dialog.SetTitle(caption);

     if ( dialog.ShowModal() == wxID_OK )
     {
         fontRet = dialog.GetFontData().GetChosenFont();
     if ( dialog.ShowModal() == wxID_OK )
     {
         fontRet = dialog.GetFontData().GetChosenFont();