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

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

diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index b39db7f12ca1d5ce27ae46835355cb50335e5093..672058b8fd306d4db2797f909bff61c4be599869 100644 (file)
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -79,6 +79,12 @@ public:
         m_index = 0;
     }
 
         m_index = 0;
     }
 

+    void ChangeStrings(const wxArrayString& strings)
+    {
+        m_strings = strings;
+        Reset();
+    }
+

     DECLARE_IUNKNOWN_METHODS;
 
     virtual HRESULT STDMETHODCALLTYPE Next(ULONG celt,
     DECLARE_IUNKNOWN_METHODS;
 
     virtual HRESULT STDMETHODCALLTYPE Next(ULONG celt,


@@ -156,7 +162,7 @@ private:
     virtual ~wxIEnumString() { }
 
 
     virtual ~wxIEnumString() { }
 
 

-    const wxArrayString m_strings;
+    wxArrayString m_strings;

     unsigned m_index;
 
     wxDECLARE_NO_COPY_CLASS(wxIEnumString);
     unsigned m_index;
 
     wxDECLARE_NO_COPY_CLASS(wxIEnumString);


@@ -305,7 +311,7 @@ bool wxTextEntry::AutoCompleteFileNames()
     static wxDynamicLibrary s_dllShlwapi;
     if ( s_pfnSHAutoComplete == (SHAutoComplete_t)-1 )
     {
     static wxDynamicLibrary s_dllShlwapi;
     if ( s_pfnSHAutoComplete == (SHAutoComplete_t)-1 )
     {

-        if ( !s_dllShlwapi.Load(_T("shlwapi.dll"), wxDL_VERBATIM | wxDL_QUIET) )
+        if ( !s_dllShlwapi.Load(wxT("shlwapi.dll"), wxDL_VERBATIM | wxDL_QUIET) )

         {
             s_pfnSHAutoComplete = NULL;
         }
         {
             s_pfnSHAutoComplete = NULL;
         }


@@ -321,7 +327,7 @@ bool wxTextEntry::AutoCompleteFileNames()
     HRESULT hr = (*s_pfnSHAutoComplete)(GetEditHwnd(), SHACF_FILESYS_ONLY);
     if ( FAILED(hr) )
     {
     HRESULT hr = (*s_pfnSHAutoComplete)(GetEditHwnd(), SHACF_FILESYS_ONLY);
     if ( FAILED(hr) )
     {

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

 
         return false;
     }
 
         return false;
     }


@@ -334,6 +340,14 @@ bool wxTextEntry::AutoCompleteFileNames()
 bool wxTextEntry::AutoComplete(const wxArrayString& choices)
 {
 #ifdef HAS_AUTOCOMPLETE
 bool wxTextEntry::AutoComplete(const wxArrayString& choices)
 {
 #ifdef HAS_AUTOCOMPLETE

+    // if we had an old enumerator we must reuse it as IAutoComplete doesn't
+    // free it if we call Init() again (see #10968) -- and it's also simpler
+    if ( m_enumStrings )
+    {
+        m_enumStrings->ChangeStrings(choices);
+        return true;
+    }
+

     // create an object exposing IAutoComplete interface (don't go for
     // IAutoComplete2 immediately as, presumably, it might be not available on
     // older systems as otherwise why do we have both -- although in practice I
     // create an object exposing IAutoComplete interface (don't go for
     // IAutoComplete2 immediately as, presumably, it might be not available on
     // older systems as otherwise why do we have both -- although in practice I


@@ -349,18 +363,18 @@ bool wxTextEntry::AutoComplete(const wxArrayString& choices)
                  );
     if ( FAILED(hr) )
     {
                  );
     if ( FAILED(hr) )
     {

-        wxLogApiError(_T("CoCreateInstance(CLSID_AutoComplete)"), hr);
+        wxLogApiError(wxT("CoCreateInstance(CLSID_AutoComplete)"), hr);

         return false;
     }
 
     // associate it with our strings
         return false;
     }
 
     // associate it with our strings

-    wxIEnumString *pEnumString = new wxIEnumString(choices);
-    pEnumString->AddRef();
-    hr = pAutoComplete->Init(GetEditHwnd(), pEnumString, NULL, NULL);
-    pEnumString->Release();
+    m_enumStrings = new wxIEnumString(choices);
+    m_enumStrings->AddRef();
+    hr = pAutoComplete->Init(GetEditHwnd(), m_enumStrings, NULL, NULL);
+    m_enumStrings->Release();

     if ( FAILED(hr) )
     {
     if ( FAILED(hr) )
     {

-        wxLogApiError(_T("IAutoComplete::Init"), hr);
+        wxLogApiError(wxT("IAutoComplete::Init"), hr);

         return false;
     }
 
         return false;
     }
 


@@ -451,7 +465,7 @@ wxString wxTextEntry::GetHint() const
         wchar_t buf[256];
         if ( ::SendMessage(GetEditHwnd(), EM_GETCUEBANNER,
                             (WPARAM)buf, WXSIZEOF(buf)) )
         wchar_t buf[256];
         if ( ::SendMessage(GetEditHwnd(), EM_GETCUEBANNER,
                             (WPARAM)buf, WXSIZEOF(buf)) )

-            return buf;
+            return wxString(buf);

     }
 
     return wxTextEntryBase::GetHint();
     }
 
     return wxTextEntryBase::GetHint();