Applied patch from Mark Armstrong <marka@availsolutions.com>

This patch fixes wx combo box callbacks being executed
multiple times per MSW callback.

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

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index e8bfc1b6d563b866f978398e0b6efc8067dc2cf9..bb325725ce255f45b21ff4941e226361a0d0ece7 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -269,11 +269,17 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 
                 event.SetString(value);
                 event.SetEventObject(this);
 
                 event.SetString(value);
                 event.SetEventObject(this);

-                ProcessCommand(event);
+                return ProcessCommand(event);

             }
             break;
     }
 
             }
             break;
     }
 

+       // I don't think the following should be true.  The return value is
+       // whether the event has been handled, not the status of the handling.
+       // So, we only return false if the switch fell through.  This will
+       // resolve the same event being sent multiple times by MS Windows.
+       // mea 05-22-01
+

     // there is no return value for the CBN_ notifications, so always return
     // FALSE from here to pass the message to DefWindowProc()
     return FALSE;
     // there is no return value for the CBN_ notifications, so always return
     // FALSE from here to pass the message to DefWindowProc()
     return FALSE;