X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c49d63403ef4e595f37e7b6b823f613048608b8..856b41f96c08d3a5620435aca1c4f26b444ece9a:/src/msw/textentry.cpp diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp index ba124d1e5a..4ea98d5bb0 100644 --- a/src/msw/textentry.cpp +++ b/src/msw/textentry.cpp @@ -287,6 +287,7 @@ void wxTextEntry::GetSelection(long *from, long *to) const // auto-completion // ---------------------------------------------------------------------------- +#if wxUSE_OLE bool wxTextEntry::AutoCompleteFileNames() { #ifdef HAS_AUTOCOMPLETE @@ -295,9 +296,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 +374,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