Fix text text changed events sending in OS X combo box and text control.

Don't duplicate needlessly wxTextEntry functionality in wxTextCtrl.

Don't clear the combobox text entry part twice in wxComboBox::DoClear(), it is
supposed to only clear the item container contents as the base class Clear()
already calls wxTextEntry::Clear().

Do send text updated events from wxTextEntry itself as it applies to
wxComboBox just as well as to wxTextCtrl.

The unit tests now pass under wxOSX/Cocoa, not breaking them again would be
appreciated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-04-06 18:46:29 +00:00
parent 501358073b
commit e567904ae6
4 changed files with 13 additions and 33 deletions

View File

@@ -79,7 +79,6 @@ void wxTextCtrl::Init()
m_dirty = false;
m_privateContextMenu = NULL;
m_triggerUpdateEvents = true ;
}
wxTextCtrl::~wxTextCtrl()
@@ -289,26 +288,6 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
return GetTextPeer()->GetLineText(lineNo) ;
}
void wxTextCtrl::Remove(long from, long to)
{
wxTextEntry::Remove(from, to);
if ( m_triggerUpdateEvents )
SendTextUpdatedEvent();
}
void wxTextCtrl::WriteText(const wxString& str)
{
wxTextEntry::WriteText( str ) ;
if ( m_triggerUpdateEvents )
SendTextUpdatedEvent();
}
void wxTextCtrl::Clear()
{
wxTextEntry::Clear() ;
SendTextUpdatedEvent();
}
void wxTextCtrl::Copy()
{
if (CanCopy())