Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the wxComboCtrl's wxTextEntry interface more complete and consistent. All text is no longer selected on SetValue(), but only when user selects an item from the drop-down list.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-12-17 11:20:50 +00:00
parent 708cc39462
commit 0306e73e63
3 changed files with 88 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/common/combocmn.cpp
View File

@@ -2388,7 +2388,7 @@ void wxComboCtrlBase::HidePopup(bool generateEvent)
// transfer value and show it in textctrl, if any
if ( !IsPopupWindowState(Animating) )
SetValue( m_popupInterface->GetStringValue() );
SetValueByUser( m_popupInterface->GetStringValue() );
m_winPopup->Hide();
@@ -2555,18 +2555,16 @@ wxString wxComboCtrlBase::DoGetValue() const
return m_valueString;
}
void wxComboCtrlBase::SetValueWithEvent(const wxString& value, bool withEvent)
void wxComboCtrlBase::SetValueWithEvent(const wxString& value,
bool withEvent)
{
if ( m_text )
{
if ( !withEvent )
m_ignoreEvtText++;
DoSetValue(value, withEvent ? SetValue_SendEvent : 0);
}
m_text->SetValue(value);
if ( !(m_iFlags & wxCC_NO_TEXT_AUTO_SELECT) )
m_text->SelectAll();
}
void wxComboCtrlBase::OnSetValue(const wxString& value)
{
// Note: before wxComboCtrl inherited from wxTextEntry,
// this code used to be in SetValueWithEvent().
// Since wxComboPopup may want to paint the combo as well, we need
// to set the string value here (as well as sometimes in ShowPopup).
@@ -2583,9 +2581,20 @@ void wxComboCtrlBase::SetValueWithEvent(const wxString& value, bool withEvent)
Refresh();
}
void wxComboCtrlBase::SetValue(const wxString& value)
void wxComboCtrlBase::SetValueByUser(const wxString& value)
{
SetValueWithEvent(value, false);
// NB: Order of function calls is important here. Otherwise
// the SelectAll() may not work.
if ( m_text )
{
m_text->SetValue(value);
if ( !(m_iFlags & wxCC_NO_TEXT_AUTO_SELECT) )
m_text->SelectAll();
}
OnSetValue(value);
}
// In this SetValue variant wxComboPopup::SetStringValue is not called
@@ -2646,24 +2655,48 @@ long wxComboCtrlBase::GetLastPosition() const
return 0;
}
void wxComboCtrlBase::Replace(long from, long to, const wxString& value)
{
if ( m_text )
m_text->Replace(from, to, value);
}
void wxComboCtrlBase::WriteText(const wxString& text)
{
if ( m_text )
{
m_text->WriteText(text);
OnSetValue(m_text->GetValue());
}
else
SetText(m_valueString + text);
{
OnSetValue(text);
}
}
void wxComboCtrlBase::DoSetValue(const wxString& value, int flags)
{
if ( m_text )
{
if ( flags & SetValue_SendEvent )
m_text->SetValue(value);
else
m_text->ChangeValue(value);
}
OnSetValue(value);
}
void wxComboCtrlBase::Replace(long from, long to, const wxString& value)
{
if ( m_text )
{
m_text->Replace(from, to, value);
OnSetValue(m_text->GetValue());
}
}
void wxComboCtrlBase::Remove(long from, long to)
{
if ( m_text )
{
m_text->Remove(from, to);
OnSetValue(m_text->GetValue());
}
}
void wxComboCtrlBase::SetSelection(long from, long to)