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

compilation fix for VC6 with standard (i.e. not updated) SDK (patch 1828610)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-09 20:34:56 +00:00
parent 0aa2e24b97
commit fd87345120
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/msw/textentry.cpp
View File

@@ -41,7 +41,12 @@
// wxIEnumString implements IEnumString interface // wxIEnumString implements IEnumString interface
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxUSE_OLE // standard VC6 SDK (WINVER == 0x0400) does not know about IAutoComplete
#if wxUSE_OLE && (WINVER >= 0x0500)
#define HAS_AUTOCOMPLETE
#endif
#ifdef HAS_AUTOCOMPLETE
#include "wx/msw/ole/oleutils.h" #include "wx/msw/ole/oleutils.h"
#include <shldisp.h> #include <shldisp.h>
@@ -160,7 +165,7 @@ END_IID_TABLE;
IMPLEMENT_IUNKNOWN_METHODS(wxIEnumString) IMPLEMENT_IUNKNOWN_METHODS(wxIEnumString)
#endif // wxUSE_OLE #endif // HAS_AUTOCOMPLETE
// ============================================================================ // ============================================================================
// wxTextEntry implementation // wxTextEntry implementation
@@ -282,10 +287,9 @@ void wxTextEntry::GetSelection(long *from, long *to) const
// auto-completion // auto-completion
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxUSE_OLE
bool wxTextEntry::AutoCompleteFileNames() bool wxTextEntry::AutoCompleteFileNames()
{ {
#ifdef HAS_AUTOCOMPLETE
typedef HRESULT (WINAPI *SHAutoComplete_t)(HWND, DWORD); typedef HRESULT (WINAPI *SHAutoComplete_t)(HWND, DWORD);
static SHAutoComplete_t s_pfnSHAutoComplete = (SHAutoComplete_t)-1; static SHAutoComplete_t s_pfnSHAutoComplete = (SHAutoComplete_t)-1;
static wxDynamicLibrary s_dllShlwapi; static wxDynamicLibrary s_dllShlwapi;
@@ -313,12 +317,15 @@ bool wxTextEntry::AutoCompleteFileNames()
return false; return false;
} }
return true; return true;
#else // !HAS_AUTOCOMPLETE
return false;
#endif // HAS_AUTOCOMPLETE/!HAS_AUTOCOMPLETE
} }
bool wxTextEntry::AutoComplete(const wxArrayString& choices) bool wxTextEntry::AutoComplete(const wxArrayString& choices)
{ {
#ifdef HAS_AUTOCOMPLETE
// create an object exposing IAutoComplete interface (don't go for // create an object exposing IAutoComplete interface (don't go for
// IAutoComplete2 immediately as, presumably, it might be not available on // IAutoComplete2 immediately as, presumably, it might be not available on
// older systems as otherwise why do we have both -- although in practice I // older systems as otherwise why do we have both -- although in practice I
@@ -366,12 +373,12 @@ bool wxTextEntry::AutoComplete(const wxArrayString& choices)
// do it immediately, presumably the edit control itself keeps a reference // do it immediately, presumably the edit control itself keeps a reference
// to the auto completer object // to the auto completer object
pAutoComplete->Release(); pAutoComplete->Release();
return true; return true;
#else // !HAS_AUTOCOMPLETE
return false;
#endif // HAS_AUTOCOMPLETE/!HAS_AUTOCOMPLETE
} }
#endif // wxUSE_OLE
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// editable state // editable state
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------