From 4e3eeddebdd4897428c0de576def883ac54f357c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 23 Jul 2012 15:03:57 +0000 Subject: [PATCH] Fix wxMSW wxTextEntry compilation in wxUSE_DYNLIB_CLASS==0 case. Simply don't define DoAutoCompleteFileNames() as it needs wxDynamicLibrary to compile and work. Closes #14510. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/textentry.h | 2 ++ src/msw/textentry.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/include/wx/msw/textentry.h b/include/wx/msw/textentry.h index c42ef8d89d..511797d90f 100644 --- a/include/wx/msw/textentry.h +++ b/include/wx/msw/textentry.h @@ -75,7 +75,9 @@ protected: // wxUSE_OLE as OleInitialize() is not called then #if wxUSE_OLE virtual bool DoAutoCompleteStrings(const wxArrayString& choices); +#if wxUSE_DYNLIB_CLASS virtual bool DoAutoCompleteFileNames(int flags); +#endif // wxUSE_DYNLIB_CLASS virtual bool DoAutoCompleteCustom(wxTextCompleter *completer); #endif // wxUSE_OLE diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp index 02936ead75..67e03be153 100644 --- a/src/msw/textentry.cpp +++ b/src/msw/textentry.cpp @@ -744,6 +744,8 @@ void wxTextEntry::GetSelection(long *from, long *to) const #ifdef HAS_AUTOCOMPLETE +#if wxUSE_DYNLIB_CLASS + bool wxTextEntry::DoAutoCompleteFileNames(int flags) { typedef HRESULT (WINAPI *SHAutoComplete_t)(HWND, DWORD); @@ -791,6 +793,8 @@ bool wxTextEntry::DoAutoCompleteFileNames(int flags) return true; } +#endif // wxUSE_DYNLIB_CLASS + wxTextAutoCompleteData *wxTextEntry::GetOrCreateCompleter() { if ( !m_autoCompleteData ) -- 2.45.2