Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxMSW wxTextEntry compilation in wxUSE_DYNLIB_CLASS==0 case.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2012-07-23 15:03:57 +00:00
parent 5fce622a21
commit 4e3eeddebd
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/textentry.h
View File

@@ -75,7 +75,9 @@ protected:
// wxUSE_OLE as OleInitialize() is not called then // wxUSE_OLE as OleInitialize() is not called then
#if wxUSE_OLE #if wxUSE_OLE
virtual bool DoAutoCompleteStrings(const wxArrayString& choices); virtual bool DoAutoCompleteStrings(const wxArrayString& choices);
#if wxUSE_DYNLIB_CLASS
virtual bool DoAutoCompleteFileNames(int flags); virtual bool DoAutoCompleteFileNames(int flags);
#endif // wxUSE_DYNLIB_CLASS
virtual bool DoAutoCompleteCustom(wxTextCompleter *completer); virtual bool DoAutoCompleteCustom(wxTextCompleter *completer);
#endif // wxUSE_OLE #endif // wxUSE_OLE

4
src/msw/textentry.cpp
View File

@@ -744,6 +744,8 @@ void wxTextEntry::GetSelection(long *from, long *to) const
#ifdef HAS_AUTOCOMPLETE #ifdef HAS_AUTOCOMPLETE
#if wxUSE_DYNLIB_CLASS
bool wxTextEntry::DoAutoCompleteFileNames(int flags) bool wxTextEntry::DoAutoCompleteFileNames(int flags)
{ {
typedef HRESULT (WINAPI *SHAutoComplete_t)(HWND, DWORD); typedef HRESULT (WINAPI *SHAutoComplete_t)(HWND, DWORD);
@@ -791,6 +793,8 @@ bool wxTextEntry::DoAutoCompleteFileNames(int flags)
return true; return true;
} }
#endif // wxUSE_DYNLIB_CLASS
wxTextAutoCompleteData *wxTextEntry::GetOrCreateCompleter() wxTextAutoCompleteData *wxTextEntry::GetOrCreateCompleter()
{ {
if ( !m_autoCompleteData ) if ( !m_autoCompleteData )