fixed wxComboBox::Clear to clear stored value

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

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index 86eb64bc307f67cb556545c578f67e3d4715c0e7..7449a7b526d15fa316bf497e241df3e551c6a3c2 100644 (file)
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -96,7 +96,7 @@ public:
     virtual int GetSelection() const;
     virtual void GetSelection(long* from, long* to) const;
     virtual void SetEditable(bool editable);
     virtual int GetSelection() const;
     virtual void GetSelection(long* from, long* to) const;
     virtual void SetEditable(bool editable);

-    virtual void Clear() { wxChoice::Clear(); m_selectionOld = -1; }
+    virtual void Clear();

 
     virtual void Undo() ;
     virtual void Redo() ;
 
     virtual void Undo() ;
     virtual void Redo() ;

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 50681b9440f0be2af8fc69da7261d4455d4cb110..d85ef7e8875e1ac76e16a5c1ad4d9f21bb5aada3 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -748,6 +748,13 @@ int wxComboBox::GetSelection() const
     return wxChoice::GetSelection();
 }
 
     return wxChoice::GetSelection();
 }
 

+void wxComboBox::Clear()
+{
+    wxChoice::Clear();
+    m_selectionOld = -1;
+    m_value.clear();
+}
+

 // ----------------------------------------------------------------------------
 // standard event handling
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // standard event handling
 // ----------------------------------------------------------------------------