From 5996fb421dc956768bc9a0031051f4c890f6ffa1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 1 Dec 2005 12:55:34 +0000 Subject: [PATCH] fixed wxComboBox::Clear to clear stored value git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/combobox.h | 2 +- src/msw/combobox.cpp | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h index 86eb64bc30..7449a7b526 100644 --- 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 void Clear() { wxChoice::Clear(); m_selectionOld = -1; } + virtual void Clear(); virtual void Undo() ; virtual void Redo() ; diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 50681b9440..d85ef7e887 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -748,6 +748,13 @@ int wxComboBox::GetSelection() const return wxChoice::GetSelection(); } +void wxComboBox::Clear() +{ + wxChoice::Clear(); + m_selectionOld = -1; + m_value.clear(); +} + // ---------------------------------------------------------------------------- // standard event handling // ---------------------------------------------------------------------------- -- 2.50.0