X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd8734512097f8d12766074c464037d6441cbd27..c3e57ac4ac9222d84ac208a493b57fb24e474a6a:/src/msw/textentry.cpp?ds=sidebyside

diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index 79c0fa201e..9c5a0fc93e 100644
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -51,7 +51,7 @@
 #include "wx/msw/ole/oleutils.h"
 #include <shldisp.h>
 
-#if defined(__MINGW32__)
+#if defined(__MINGW32__) || defined (__WATCOMC__)
     // needed for IID_IAutoComplete, IID_IAutoComplete2 and ACO_AUTOSUGGEST
     #include <shlguid.h>
 #endif
@@ -243,6 +243,11 @@ bool wxTextEntry::CanRedo() const
 
 void wxTextEntry::SetInsertionPoint(long pos)
 {
+    // calling DoSetSelection(-1, -1) would select everything which is not what
+    // we want here
+    if ( pos == -1 )
+        pos = GetLastPosition();
+
     // be careful to call DoSetSelection() which is overridden in wxTextCtrl
     // and not just SetSelection() here
     DoSetSelection(pos, pos);
@@ -287,6 +292,7 @@ void wxTextEntry::GetSelection(long *from, long *to) const
 // auto-completion
 // ----------------------------------------------------------------------------
 
+#if wxUSE_OLE
 bool wxTextEntry::AutoCompleteFileNames()
 {
 #ifdef HAS_AUTOCOMPLETE
@@ -295,9 +301,7 @@ bool wxTextEntry::AutoCompleteFileNames()
     static wxDynamicLibrary s_dllShlwapi;
     if ( s_pfnSHAutoComplete == (SHAutoComplete_t)-1 )
     {
-        wxLogNull noLog;
-
-        if ( !s_dllShlwapi.Load(_T("shlwapi.dll"), wxDL_VERBATIM) )
+        if ( !s_dllShlwapi.Load(_T("shlwapi.dll"), wxDL_VERBATIM | wxDL_QUIET) )
         {
             s_pfnSHAutoComplete = NULL;
         }
@@ -375,9 +379,12 @@ bool wxTextEntry::AutoComplete(const wxArrayString& choices)
     pAutoComplete->Release();
     return true;
 #else // !HAS_AUTOCOMPLETE
+    wxUnusedVar(choices);
+
     return false;
 #endif // HAS_AUTOCOMPLETE/!HAS_AUTOCOMPLETE
 }
+#endif // wxUSE_OLE
 
 // ----------------------------------------------------------------------------
 // editable state