No changes, just refactor wxMSW wxComboBox code calling GetComboBoxInfo().

Move the code dynamically loading this function to the base wxChoice class to
make it possible to use it from there in the upcoming commit.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-11-14 13:47:36 +00:00
parent 04f8a852c1
commit df74e2d251
3 changed files with 32 additions and 20 deletions

View File

@@ -39,7 +39,6 @@
#endif
#include "wx/clipbrd.h"
#include "wx/dynlib.h"
#include "wx/wupdlock.h"
#include "wx/msw/private.h"
@@ -378,26 +377,9 @@ bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg)
WXHWND wxComboBox::GetEditHWNDIfAvailable() const
{
#if wxUSE_DYNLIB_CLASS
#if defined(WINVER) && WINVER >= 0x0500
typedef BOOL (WINAPI *GetComboBoxInfo_t)(HWND, COMBOBOXINFO*);
static GetComboBoxInfo_t s_pfnGetComboBoxInfo = NULL;
static bool s_triedToLoad = false;
if ( !s_triedToLoad )
{
s_triedToLoad = true;
wxLoadedDLL dllUser32("user32.dll");
wxDL_INIT_FUNC(s_pfn, GetComboBoxInfo, dllUser32);
}
if ( s_pfnGetComboBoxInfo )
{
WinStruct<COMBOBOXINFO> info;
(*s_pfnGetComboBoxInfo)(GetHwnd(), &info);
WinStruct<COMBOBOXINFO> info;
if ( MSWGetComboBoxInfo(&info) )
return info.hwndItem;
}
#endif // WINVER >= 0x0500
#endif // wxUSE_DYNLIB_CLASS
if (HasFlag(wxCB_SIMPLE))
{