Fix discrepancy between different ways of measuring text extents under Mac.

[wxWidgets.git] / src / msw / combobox.cpp

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index eda21ff9c6e63b42ee5aa62f7afec9ad4fb6bd8f..84b1bca018f7d2a220f8d3f8732dce093cbf0b06 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -438,11 +438,7 @@ bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg)
 
 WXHWND wxComboBox::GetEditHWNDIfAvailable() const
 {
 
 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;
     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;
     }
         (*s_pfnGetComboBoxInfo)(GetHwnd(), &info);
         return info.hwndItem;
     }

+#endif

 
     if (HasFlag(wxCB_SIMPLE))
     {
 
     if (HasFlag(wxCB_SIMPLE))
     {


@@ -467,6 +464,11 @@ WXHWND wxComboBox::GetEditHWNDIfAvailable() const
         return (WXHWND) ::ChildWindowFromPoint(GetHwnd(), pt);
     }
 
         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);
 }
     // we assume that the only child of the combobox is the edit window
     return (WXHWND)::GetWindow(GetHwnd(), GW_CHILD);
 }