AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't lose the contents of the combobox if it was set to a value not in a list and a popup has been opened and closed (patch 1883474)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-02-09 15:22:15 +00:00
parent ba959d4c98
commit 5de69dd366
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/choice.h
View File

@ -66,6 +66,8 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr); const wxString& name = wxChoiceNameStr);
virtual void SetLabel(const wxString& label);
virtual unsigned int GetCount() const; virtual unsigned int GetCount() const;
virtual int GetSelection() const; virtual int GetSelection() const;
virtual int GetCurrentSelection() const; virtual int GetCurrentSelection() const;

15
src/msw/choice.cpp
View File

@ -158,6 +158,21 @@ bool wxChoice::CreateAndInit(wxWindow *parent,
return true; return true;
} }
void wxChoice::SetLabel(const wxString& label)
{
if ( FindString(label) == wxNOT_FOUND )
{
// unless we explicitly do this here, CB_GETCURSEL will continue to
// return the index of the previously selected item which will result
// in wrongly replacing the value being set now with the previously
// value if the user simply opens and closes (without selecting
// anything) the combobox popup
SetSelection(-1);
}
wxChoiceBase::SetLabel(label);
}
bool wxChoice::Create(wxWindow *parent, bool wxChoice::Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,