X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e558f9533e5e628efef8027b2434c00f3d4ed8cf..0738b901b17340f09766524b8d9d79e9ed1268e7:/src/msw/combobox.cpp diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index eda21ff9c6..84b1bca018 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -438,11 +438,7 @@ bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg) WXHWND wxComboBox::GetEditHWNDIfAvailable() const { - // notice that a slightly safer alternative could be to use FindWindowEx() - // but it's not available under WinCE so just take the first child for now - // to keep one version of the code for all platforms and fix it later if - // problems are discovered - +#if defined(WINVER) && WINVER >= 0x0500 typedef BOOL (WINAPI *GetComboBoxInfo_t)(HWND, COMBOBOXINFO*); static GetComboBoxInfo_t s_pfnGetComboBoxInfo = NULL; static bool s_triedToLoad = false; @@ -459,6 +455,7 @@ WXHWND wxComboBox::GetEditHWNDIfAvailable() const (*s_pfnGetComboBoxInfo)(GetHwnd(), &info); return info.hwndItem; } +#endif if (HasFlag(wxCB_SIMPLE)) { @@ -467,6 +464,11 @@ WXHWND wxComboBox::GetEditHWNDIfAvailable() const return (WXHWND) ::ChildWindowFromPoint(GetHwnd(), pt); } + // notice that a slightly safer alternative could be to use FindWindowEx() + // but it's not available under WinCE so just take the first child for now + // to keep one version of the code for all platforms and fix it later if + // problems are discovered + // we assume that the only child of the combobox is the edit window return (WXHWND)::GetWindow(GetHwnd(), GW_CHILD); }