Output the extracted number from wxString::ToXXX() even if it returns false.

[wxWidgets.git] / src / msw / utilsgui.cpp

diff --git a/src/msw/utilsgui.cpp b/src/msw/utilsgui.cpp
index 1ee21a202644e9a79a18a34320c875c3f6ba6f15..513a56f8101f6ac50c6c0619f3e1aff8fabe511d 100644 (file)
--- a/src/msw/utilsgui.cpp
+++ b/src/msw/utilsgui.cpp
@@ -372,11 +372,11 @@ extern bool wxEnableFileNameAutoComplete(HWND hwnd)
         s_initialized = true;
 
         wxLogNull nolog;
         s_initialized = true;
 
         wxLogNull nolog;

-        wxDynamicLibrary dll(_T("shlwapi.dll"));
+        wxDynamicLibrary dll(wxT("shlwapi.dll"));

         if ( dll.IsLoaded() )
         {
             s_pfnSHAutoComplete =
         if ( dll.IsLoaded() )
         {
             s_pfnSHAutoComplete =

-                (SHAutoComplete_t)dll.GetSymbol(_T("SHAutoComplete"));
+                (SHAutoComplete_t)dll.GetSymbol(wxT("SHAutoComplete"));

             if ( s_pfnSHAutoComplete )
             {
                 // won't be unloaded until the process termination, no big deal
             if ( s_pfnSHAutoComplete )
             {
                 // won't be unloaded until the process termination, no big deal


@@ -391,7 +391,7 @@ extern bool wxEnableFileNameAutoComplete(HWND hwnd)
     HRESULT hr = s_pfnSHAutoComplete(hwnd, 0x10 /* SHACF_FILESYS_ONLY */);
     if ( FAILED(hr) )
     {
     HRESULT hr = s_pfnSHAutoComplete(hwnd, 0x10 /* SHACF_FILESYS_ONLY */);
     if ( FAILED(hr) )
     {

-        wxLogApiError(_T("SHAutoComplete"), hr);
+        wxLogApiError(wxT("SHAutoComplete"), hr);

         return false;
     }
 
         return false;
     }
 


@@ -412,7 +412,7 @@ bool wxLaunchDefaultApplication(const wxString& document, int flags)
 
     WinStruct<SHELLEXECUTEINFO> sei;
     sei.lpFile = document.wx_str();
 
     WinStruct<SHELLEXECUTEINFO> sei;
     sei.lpFile = document.wx_str();

-    sei.lpVerb = _T("open");
+    sei.lpVerb = wxT("open");

 #ifdef __WXWINCE__
     sei.nShow = SW_SHOWNORMAL; // SW_SHOWDEFAULT not defined under CE (#10216)
 #else
 #ifdef __WXWINCE__
     sei.nShow = SW_SHOWNORMAL; // SW_SHOWDEFAULT not defined under CE (#10216)
 #else


@@ -437,17 +437,17 @@ bool wxLaunchDefaultApplication(const wxString& document, int flags)
 bool wxDoLaunchDefaultBrowser(const wxString& url, const wxString& scheme, int flags)
 {
     wxUnusedVar(flags);
 bool wxDoLaunchDefaultBrowser(const wxString& url, const wxString& scheme, int flags)
 {
     wxUnusedVar(flags);

-    
+

 #if wxUSE_IPC
     if ( flags & wxBROWSER_NEW_WINDOW )
     {
         // ShellExecuteEx() opens the URL in an existing window by default so
         // we can't use it if we need a new window
 #if wxUSE_IPC
     if ( flags & wxBROWSER_NEW_WINDOW )
     {
         // ShellExecuteEx() opens the URL in an existing window by default so
         // we can't use it if we need a new window

-        wxRegKey key(wxRegKey::HKCR, scheme + _T("\\shell\\open"));
+        wxRegKey key(wxRegKey::HKCR, scheme + wxT("\\shell\\open"));

         if ( !key.Exists() )
         {
             // try the default browser, it must be registered at least for http URLs
         if ( !key.Exists() )
         {
             // try the default browser, it must be registered at least for http URLs

-            key.SetName(wxRegKey::HKCR, _T("http\\shell\\open"));
+            key.SetName(wxRegKey::HKCR, wxT("http\\shell\\open"));

         }
 
         if ( key.Exists() )
         }
 
         if ( key.Exists() )


@@ -507,7 +507,7 @@ bool wxDoLaunchDefaultBrowser(const wxString& url, const wxString& scheme, int f
 
     WinStruct<SHELLEXECUTEINFO> sei;
     sei.lpFile = url.c_str();
 
     WinStruct<SHELLEXECUTEINFO> sei;
     sei.lpFile = url.c_str();

-    sei.lpVerb = _T("open");
+    sei.lpVerb = wxT("open");

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