From b7bfef380642a8afd3606ac1e6835bb3fb475051 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 19 Sep 2008 10:08:02 +0000
Subject: [PATCH] implement EnableTextChangedEvents() to make ChangeValue()
 work as expected, i.e. not generate any events

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/combobox.h | 23 +++++++++++++++++++++--
 src/msw/combobox.cpp      |  1 +
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index 0cebad256d..e96d4d95c4 100644
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -22,10 +22,10 @@
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_CORE wxComboBox : public wxChoice,
-                               public wxTextEntry
+                                    public wxTextEntry
 {
 public:
-    wxComboBox() { }
+    wxComboBox() { Init(); }
 
     wxComboBox(wxWindow *parent, wxWindowID id,
             const wxString& value = wxEmptyString,
@@ -36,8 +36,11 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxComboBoxNameStr)
     {
+        Init();
         Create(parent, id, value, pos, size, n, choices, style, validator, name);
+
     }
+
     wxComboBox(wxWindow *parent, wxWindowID id,
             const wxString& value,
             const wxPoint& pos,
@@ -47,6 +50,8 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxComboBoxNameStr)
     {
+        Init();
+
         Create(parent, id, value, pos, size, choices, style, validator, name);
     }
 
@@ -125,11 +130,25 @@ protected:
     // just testing for IsEditable() and using GetEditHWND() should be enough
     WXHWND GetEditHWNDIfAvailable() const;
 
+    virtual void EnableTextChangedEvents(bool enable)
+    {
+        m_allowTextEvents = enable;
+    }
+
 private:
     // this is the overridden wxTextEntry method which should only be called
     // when we do have an edit control so it asserts if this is not the case
     virtual WXHWND GetEditHWND() const;
 
+    // common part of all ctors
+    void Init()
+    {
+        m_allowTextEvents = true;
+    }
+
+    // normally true, false if text events are currently disabled
+    bool m_allowTextEvents;
+
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
     DECLARE_EVENT_TABLE()
 };
diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 9d8e4a542d..e1e0d991cf 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -343,6 +343,7 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)
             // logical as the text does change)
 
         case CBN_EDITCHANGE:
+            if ( m_allowTextEvents )
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
 
-- 
2.45.2