projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix crash which happened if you called SetAttr(NULL) followed by SetAttr(attr) (...
[wxWidgets.git]
/
src
/
msw
/
textentry.cpp
diff --git
a/src/msw/textentry.cpp
b/src/msw/textentry.cpp
index 79c0fa201ed13207a37d362c7bf00f94bd2fb362..b763b5de8e9051f460441b936932a61e7d2be0a7 100644
(file)
--- a/
src/msw/textentry.cpp
+++ b/
src/msw/textentry.cpp
@@
-51,7
+51,7
@@
#include "wx/msw/ole/oleutils.h"
#include <shldisp.h>
#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
// needed for IID_IAutoComplete, IID_IAutoComplete2 and ACO_AUTOSUGGEST
#include <shlguid.h>
#endif
@@
-295,9
+295,7
@@
bool wxTextEntry::AutoCompleteFileNames()
static wxDynamicLibrary s_dllShlwapi;
if ( s_pfnSHAutoComplete == (SHAutoComplete_t)-1 )
{
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;
}
{
s_pfnSHAutoComplete = NULL;
}
@@
-375,6
+373,8
@@
bool wxTextEntry::AutoComplete(const wxArrayString& choices)
pAutoComplete->Release();
return true;
#else // !HAS_AUTOCOMPLETE
pAutoComplete->Release();
return true;
#else // !HAS_AUTOCOMPLETE
+ wxUnusedVar(choices);
+
return false;
#endif // HAS_AUTOCOMPLETE/!HAS_AUTOCOMPLETE
}
return false;
#endif // HAS_AUTOCOMPLETE/!HAS_AUTOCOMPLETE
}