Fixed erroneous selection of content in comboboxes within static boxes

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

diff --git a/docs/changes.txt b/docs/changes.txt
index b9332dfc0b8b3cbc564b0ed84cc449128b8cdcf9..a97a82e1a583273195f4f5b6ab1a20f6dc1459f4 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -4,12 +4,21 @@ wxWidgets Change Log - For more verbose changes, see the manual
 
 2.6.1
 -----
+
 All:
+
 - Added wxLaunchDefaultBrowser.
 
+wxMSW:
+
+- Fixed erroneous selection of content in wxComboBox when within a wxStaticBox.
+
 wxMac:
-- Added support for launching 'APPL' bundles with wxExecute (usually they have a .app extension and are the ones that reside in the Applications folder).
-- Fixed a bug in wxGetKeyState where shift and some other keys were returning an incorrect state.
+
+- Added support for launching 'APPL' bundles with wxExecute (usually they have a
+  .app extension and are the ones that reside in the Applications folder).
+- Fixed a bug in wxGetKeyState where shift and some other keys were returning an
+  incorrect state.
 
 2.6.0
 -----

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 90f5da5765995ebdcfa0dd02bdee792cda97676a..520e547064862e0af3478b81ac0c488ddcfa3c51 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -259,6 +259,9 @@ WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
             break;
 
         case WM_SIZE:
+        // wxStaticBox can generate this message, when modifying the control's style.
+        // This causes the content of the combobox to be selected, for some reason.
+        case WM_STYLECHANGED:
             {
                 // combobox selection sometimes spontaneously changes when its
                 // size changes, restore it to the old value if necessary