moved code working around combobox selection bug to wxComboBox: wxChoice doesn't...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index 4a841ec05b54efa03e0733ae0f66b20ade6c71fb..27caec6e34bcf8212b9ad71350911d84c2c9e76a 100644 (file)
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -136,6 +136,9 @@ public:
 
 protected:
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
 
     // common part of all ctors
     void Init() { m_selectionOld = -1; }

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 95632e70576aa67eb8efd093428e8a29e8665514..362f98ccb71f7b3fad21fcad4d0289b140554f2f 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -505,24 +505,8 @@ void wxChoice::DoSetSize(int x, int y,
         height += hItem*(nItems + 1);
     }
 
-    // To work around a Windows bug (see "Bug in Windows Combobox" thread in Google Groups)
-    // we have to reset the selection if it was accidentally selected in the size.
-    DWORD oldSelStart = 0;
-    DWORD oldSelEnd = 0;
-    DWORD newSelStart = 0;
-    DWORD newSelEnd = 0;
-
-    ::SendMessage(GetHwnd(), CB_GETEDITSEL, (WPARAM) & oldSelStart, (LPARAM) & oldSelEnd);
-
     wxControl::DoSetSize(x, y, width, height, sizeFlags);
 
-    ::SendMessage(GetHwnd(), CB_GETEDITSEL, (WPARAM) & newSelStart, (LPARAM) & newSelEnd);
-
-    if (oldSelStart != newSelStart || oldSelEnd != newSelEnd)
-    {
-        ::SendMessage(GetHwnd(), CB_SETEDITSEL, (WPARAM) 0, (LPARAM) MAKELPARAM(oldSelStart, oldSelEnd));
-    }
-
     // I'm commenting this out since the code appears to make choices
     // and comboxes too high when they have associated sizers. I'm sure this
     // is not the end of the story, which is why I'm leaving it #if'ed out for

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index c8ccafc1a54dca18b46b275c2ee3ad6bc7059d65..4bb8998363281544bb3aa2ba7e7c956bfa762fe3 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -476,6 +476,29 @@ WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const
     return msStyle;
 }
 
+// ----------------------------------------------------------------------------
+// wxComboBox geometry
+// ----------------------------------------------------------------------------
+
+void
+wxComboBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    // work around a Windows bug (search for "Bug in Windows Combobox" in
+    // Google Groups): resizing the combobox changes the selection in it
+    long fromOld, toOld;
+    GetSelection(&fromOld, &toOld);
+
+    wxChoice::DoSetSize(x, y, width, height, sizeFlags);
+
+    long fromNew, toNew;
+    GetSelection(&fromNew, &toNew);
+
+    if ( fromOld != fromNew || toOld != toNew )
+    {
+        SetSelection(fromOld, toOld);
+    }
+}
+
 // ----------------------------------------------------------------------------
 // wxComboBox text control-like methods
 // ----------------------------------------------------------------------------