fix substr() calls broken by r56215 (#10198)

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 9b5d7cac6b06119937e088640b75cacbffdf11cf..a498ce07e6e33ec206442ae4d917d09c5a7cf77c 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -943,7 +943,8 @@ bool wxLaunchDefaultApplication(const wxString& document, int flags)
 
 #ifdef __WXMAC__
     static const char * const OPEN_CMD = "/usr/bin/open";
 
 #ifdef __WXMAC__
     static const char * const OPEN_CMD = "/usr/bin/open";

-    if ( wxFileExists(OPEN_CMD) && wxExecute(OPEN_CMD + " " + document) )
+    if ( wxFileExists(OPEN_CMD) &&
+            wxExecute(wxString(OPEN_CMD) + " " + document) )

         return true;
 #elif defined(__UNIX__)
     // Our best best is to use xdg-open from freedesktop.org cross-desktop
         return true;
 #elif defined(__UNIX__)
     // Our best best is to use xdg-open from freedesktop.org cross-desktop


@@ -963,7 +964,7 @@ bool wxLaunchDefaultApplication(const wxString& document, int flags)
                                       (
                                         NULL,           // parent window
                                         _T("open"),
                                       (
                                         NULL,           // parent window
                                         _T("open"),

-                                        document,
+                                        document.wx_str(),

                                         NULL,           // parameters
                                         NULL,           // working directory
                                         SW_SHOWDEFAULT
                                         NULL,           // parameters
                                         NULL,           // working directory
                                         SW_SHOWDEFAULT


@@ -1020,13 +1021,14 @@ static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags)
             wxRegKey keyDDE(key, wxT("DDEExec"));
             if ( keyDDE.Exists() )
             {
             wxRegKey keyDDE(key, wxT("DDEExec"));
             if ( keyDDE.Exists() )
             {

-                const wxString ddeTopic = wxRegKey(keyDDE, wxT("topic"));
-

                 // we only know the syntax of WWW_OpenURL DDE request for IE,
                 // optimistically assume that all other browsers are compatible
                 // with it
                 // we only know the syntax of WWW_OpenURL DDE request for IE,
                 // optimistically assume that all other browsers are compatible
                 // with it

+                static const wxChar *TOPIC_OPEN_URL = wxT("WWW_OpenURL");

                 wxString ddeCmd;
                 wxString ddeCmd;

-                bool ok = ddeTopic == wxT("WWW_OpenURL");
+                wxRegKey keyTopic(keyDDE, wxT("topic"));
+                bool ok = keyTopic.Exists() &&
+                            keyTopic.QueryDefaultValue() == TOPIC_OPEN_URL;

                 if ( ok )
                 {
                     ddeCmd = keyDDE.QueryDefaultValue();
                 if ( ok )
                 {
                     ddeCmd = keyDDE.QueryDefaultValue();


@@ -1039,7 +1041,7 @@ static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags)
                     // in is -1 (meaning "current") by default, replace it with
                     // 0 which means "new" (see KB article 160957)
                     ok = ddeCmd.Replace(wxT("-1"), wxT("0"),
                     // in is -1 (meaning "current") by default, replace it with
                     // 0 which means "new" (see KB article 160957)
                     ok = ddeCmd.Replace(wxT("-1"), wxT("0"),

-                                        false /* only first occurence */) == 1;
+                                        false /* only first occurrence */) == 1;

                 }
 
                 if ( ok )
                 }
 
                 if ( ok )


@@ -1055,7 +1057,7 @@ static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags)
                     wxLogNull noLog;
 
                     const wxString ddeServer = wxRegKey(keyDDE, wxT("application"));
                     wxLogNull noLog;
 
                     const wxString ddeServer = wxRegKey(keyDDE, wxT("application"));

-                    if ( wxExecuteDDE(ddeServer, ddeTopic, ddeCmd) )
+                    if ( wxExecuteDDE(ddeServer, TOPIC_OPEN_URL, ddeCmd) )

                         return true;
 
                     // this is not necessarily an error: maybe browser is
                         return true;
 
                     // this is not necessarily an error: maybe browser is


@@ -1073,6 +1075,7 @@ static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags)
     sei.lpFile = url.c_str();
     sei.lpVerb = _T("open");
     sei.nShow = SW_SHOWNORMAL;
     sei.lpFile = url.c_str();
     sei.lpVerb = _T("open");
     sei.nShow = SW_SHOWNORMAL;

+    sei.fMask = SEE_MASK_FLAG_NO_UI; // we give error message ourselves

 
     ::ShellExecuteEx(&sei);
 
 
     ::ShellExecuteEx(&sei);