merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -337,6 +337,13 @@ void wxTextCtrl::SetValue( const wxString &value )
|
||||
{
|
||||
gtk_entry_set_text( GTK_ENTRY(m_text), tmp.mbc_str() );
|
||||
}
|
||||
|
||||
// GRG, Jun/2000: Changed this after a lot of discussion in
|
||||
// the lists. wxWindows 2.2 will have a set of flags to
|
||||
// customize this behaviour.
|
||||
SetInsertionPoint(0);
|
||||
|
||||
m_modified = FALSE;
|
||||
}
|
||||
|
||||
void wxTextCtrl::WriteText( const wxString &text )
|
||||
@@ -614,7 +621,7 @@ bool wxTextCtrl::Enable( bool enable )
|
||||
// nothing to do
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
if (m_windowStyle & wxTE_MULTILINE)
|
||||
{
|
||||
gtk_text_set_editable( GTK_TEXT(m_text), enable );
|
||||
@@ -778,8 +785,9 @@ void wxTextCtrl::GetSelection(long* from, long* to) const
|
||||
|
||||
if (!(GTK_EDITABLE(m_text)->has_selection))
|
||||
{
|
||||
if (from) *from = 0;
|
||||
if (to) *to = 0;
|
||||
long i = GetInsertionPoint();
|
||||
if (from) *from = i;
|
||||
if (to) *to = i;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -812,6 +820,7 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event )
|
||||
{
|
||||
wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
|
||||
event.SetEventObject(this);
|
||||
event.SetString(GetValue());
|
||||
if (GetEventHandler()->ProcessEvent(event)) return;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user