X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/247e5b1632de606eda8fb8f1bc46f9179ba56fb8..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/gtk1/textctrl.cpp diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index 8a2fcc6491..1c63ae186e 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -14,11 +14,14 @@ #include "wx/textctrl.h" #include "wx/utils.h" #include "wx/intl.h" +#include "wx/log.h" #include "wx/settings.h" +#include "wx/panel.h" #include #include #include +#include // for fabs #include "gdk/gdk.h" #include "gtk/gtk.h" @@ -38,23 +41,89 @@ extern bool g_isIdle; extern bool g_blockEventsOnDrag; extern wxCursor g_globalCursor; +// ---------------------------------------------------------------------------- +// helpers +// ---------------------------------------------------------------------------- + +static void wxGtkTextInsert(GtkWidget *text, + const wxTextAttr& attr, + const char *txt, + size_t len) +{ + GdkFont *font = attr.HasFont() ? attr.GetFont().GetInternalFont() + : NULL; + + GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor() + : NULL; + + GdkColor *colBg = attr.HasBackgroundColour() + ? attr.GetBackgroundColour().GetColor() + : NULL; + + gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len ); +} + +// ---------------------------------------------------------------------------- +// "insert_text" for GtkEntry +// ---------------------------------------------------------------------------- + +static void +gtk_insert_text_callback(GtkEditable *editable, + const gchar *new_text, + gint new_text_length, + gint *position, + wxTextCtrl *win) +{ + if (g_isIdle) + wxapp_install_idle_handler(); + + // we should only be called if we have a max len limit at all + GtkEntry *entry = GTK_ENTRY (editable); + + wxCHECK_RET( entry->text_max_length, _T("shouldn't be called") ); + + // check that we don't overflow the max length limit + // + // FIXME: this doesn't work when we paste a string which is going to be + // truncated + if ( entry->text_length == entry->text_max_length ) + { + // we don't need to run the base class version at all + gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text"); + + // remember that the next changed signal is to be ignored to avoid + // generating a dummy wxEVT_COMMAND_TEXT_UPDATED event + win->IgnoreNextTextUpdate(); + + // and generate the correct one ourselves + wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, win->GetId()); + event.SetEventObject(win); + event.SetString(win->GetValue()); + win->GetEventHandler()->ProcessEvent( event ); + } +} + //----------------------------------------------------------------------------- // "changed" //----------------------------------------------------------------------------- static void -gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) +gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win ) { + if ( win->IgnoreTextUpdate() ) + return; + if (!win->m_hasVMT) return; if (g_isIdle) wxapp_install_idle_handler(); win->SetModified(); + win->UpdateFontIfNeeded(); wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); - event.SetString( win->GetValue() ); event.SetEventObject( win ); + event.SetString( win->GetValue() ); win->GetEventHandler()->ProcessEvent( event ); } @@ -95,22 +164,37 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo) END_EVENT_TABLE() -wxTextCtrl::wxTextCtrl() +void wxTextCtrl::Init() { + m_ignoreNextUpdate = m_modified = FALSE; + m_updateFont = FALSE; + m_text = + m_vScrollbar = (GtkWidget *)NULL; } -wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value, - const wxPoint &pos, const wxSize &size, - int style, const wxValidator& validator, const wxString &name ) +wxTextCtrl::wxTextCtrl( wxWindow *parent, + wxWindowID id, + const wxString &value, + const wxPoint &pos, + const wxSize &size, + long style, + const wxValidator& validator, + const wxString &name ) { - m_modified = FALSE; + Init(); + Create( parent, id, value, pos, size, style, validator, name ); } -bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, - const wxPoint &pos, const wxSize &size, - int style, const wxValidator& validator, const wxString &name ) +bool wxTextCtrl::Create( wxWindow *parent, + wxWindowID id, + const wxString &value, + const wxPoint &pos, + const wxSize &size, + long style, + const wxValidator& validator, + const wxString &name ) { m_needParent = TRUE; m_acceptsFocus = TRUE; @@ -119,7 +203,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxTextCtrl creation failed") ); - return FALSE; + return FALSE; } @@ -182,22 +266,26 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, m_text = gtk_entry_new(); } - wxSize newSize = size; - if (newSize.x == -1) newSize.x = 80; - if (newSize.y == -1) newSize.y = 26; - SetSize( newSize.x, newSize.y ); - m_parent->DoAddChild( this ); + m_focusWidget = m_text; + PostCreation(); + SetFont( parent->GetFont() ); + + wxSize size_best( DoGetBestSize() ); + wxSize new_size( size ); + if (new_size.x == -1) + new_size.x = size_best.x; + if (new_size.y == -1) + new_size.y = size_best.y; + if ((new_size.x != size.x) || (new_size.y != size.y)) + SetSize( new_size.x, new_size.y ); + if (multi_line) gtk_widget_show(m_text); - /* we want to be notified about text changes */ - gtk_signal_connect( GTK_OBJECT(m_text), "changed", - GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); - if (multi_line) { gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed", @@ -246,11 +334,22 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, gtk_text_set_editable( GTK_TEXT(m_text), 1 ); } - SetBackgroundColour( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ); - SetForegroundColour( parent->GetForegroundColour() ); + /* we want to be notified about text changes */ + gtk_signal_connect( GTK_OBJECT(m_text), "changed", + GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); + + /* we don't set a valid background colour, because the window + manager should use a default one */ + m_backgroundColour = wxColour(); + + wxColour colFg = parent->GetForegroundColour(); + SetForegroundColour( colFg ); m_cursor = wxCursor( wxCURSOR_IBEAM ); - + + wxTextAttr attrDef( colFg, m_backgroundColour, parent->GetFont() ); + SetDefaultStyle( attrDef ); + Show( TRUE ); return TRUE; @@ -303,138 +402,123 @@ void wxTextCtrl::SetValue( const wxString &value ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - wxString tmp = wxT(""); - if (!value.IsNull()) tmp = value; if (m_windowStyle & wxTE_MULTILINE) { gint len = gtk_text_get_length( GTK_TEXT(m_text) ); gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len ); len = 0; #if wxUSE_UNICODE - wxWX2MBbuf tmpbuf = tmp.mbc_str(); + wxWX2MBbuf tmpbuf = value.mbc_str(); gtk_editable_insert_text( GTK_EDITABLE(m_text), tmpbuf, strlen(tmpbuf), &len ); #else - gtk_editable_insert_text( GTK_EDITABLE(m_text), tmp.mbc_str(), tmp.Length(), &len ); + gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.Length(), &len ); #endif } else { - gtk_entry_set_text( GTK_ENTRY(m_text), tmp.mbc_str() ); + gtk_entry_set_text( GTK_ENTRY(m_text), value.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 ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (text.IsEmpty()) return; - - if (m_windowStyle & wxTE_MULTILINE) - { - /* this moves the cursor pos to behind the inserted text */ - gint len = GTK_EDITABLE(m_text)->current_pos; + if ( text.empty() ) + return; #if wxUSE_UNICODE - wxWX2MBbuf buf = text.mbc_str(); - gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len ); + wxWX2MBbuf buf = text.mbc_str(); + const char *txt = buf; + size_t txtlen = strlen(buf); #else - gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len ); + const char *txt = text; + size_t txtlen = text.length(); #endif - /* bring editable's cursor uptodate. bug in GTK. */ + if ( m_windowStyle & wxTE_MULTILINE ) + { + // After cursor movements, gtk_text_get_point() is wrong by one. + gtk_text_set_point( GTK_TEXT(m_text), GTK_EDITABLE(m_text)->current_pos ); + + // if we have any special style, use it + if ( !m_defaultStyle.IsDefault() ) + { + GetInsertionPoint(); + + wxGtkTextInsert(m_text, m_defaultStyle, txt, txtlen); + } + else // no style + { + gint len = GTK_EDITABLE(m_text)->current_pos; + gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len ); + } + + // Bring editable's cursor back uptodate. GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); } - else + else // single line { - /* this moves the cursor pos to behind the inserted text */ + // This moves the cursor pos to behind the inserted text. gint len = GTK_EDITABLE(m_text)->current_pos; -#if wxUSE_UNICODE - wxWX2MBbuf buf = text.mbc_str(); - gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len ); -#else - gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len ); -#endif + gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len ); - /* bring editable's cursor uptodate. bug in GTK. */ + // Bring editable's cursor uptodate. GTK_EDITABLE(m_text)->current_pos += text.Len(); - /* bring entry's cursor uptodate. bug in GTK. */ + // Bring entry's cursor uptodate. gtk_entry_set_position( GTK_ENTRY(m_text), GTK_EDITABLE(m_text)->current_pos ); } + + m_modified = TRUE; } void wxTextCtrl::AppendText( const wxString &text ) { - wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - - if (text.IsEmpty()) return; + SetInsertionPointEnd(); + WriteText( text ); +} +wxString wxTextCtrl::GetLineText( long lineNo ) const +{ if (m_windowStyle & wxTE_MULTILINE) { - bool hasSpecialAttributes = m_font.Ok() || - m_foregroundColour.Ok() || - m_backgroundColour.Ok(); - if ( hasSpecialAttributes ) + gint len = gtk_text_get_length( GTK_TEXT(m_text) ); + char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); + + if (text) { - gtk_text_insert( GTK_TEXT(m_text), - m_font.GetInternalFont(), - m_foregroundColour.GetColor(), - m_backgroundColour.GetColor(), - text.mbc_str(), text.length()); + wxString buf(wxT("")); + long i; + int currentLine = 0; + for (i = 0; currentLine != lineNo && text[i]; i++ ) + if (text[i] == '\n') + currentLine++; + // Now get the text + int j; + for (j = 0; text[i] && text[i] != '\n'; i++, j++ ) + buf += text[i]; + g_free( text ); + return buf; } else { - /* we'll insert at the last position */ - gint len = gtk_text_get_length( GTK_TEXT(m_text) ); -#if wxUSE_UNICODE - wxWX2MBbuf buf = text.mbc_str(); - gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len ); -#else - gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len ); -#endif + return wxEmptyString; } - - /* bring editable's cursor uptodate. bug in GTK. */ - GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); } else { - gtk_entry_append_text( GTK_ENTRY(m_text), text.mbc_str() ); - } -} - -wxString wxTextCtrl::GetLineText( long lineNo ) const -{ - if (m_windowStyle & wxTE_MULTILINE) - { - gint len = gtk_text_get_length( GTK_TEXT(m_text) ); - char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); - - if (text) - { - wxString buf(wxT("")); - long i; - int currentLine = 0; - for (i = 0; currentLine != lineNo && text[i]; i++ ) - if (text[i] == '\n') - currentLine++; - // Now get the text - int j; - for (j = 0; text[i] && text[i] != '\n'; i++, j++ ) - buf += text[i]; - - g_free( text ); - return buf; + if (lineNo == 0) return GetValue(); + return wxEmptyString; } - else - return wxEmptyString; - } - else - { - if (lineNo == 0) return GetValue(); - return wxEmptyString; - } } void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) ) @@ -567,7 +651,7 @@ void wxTextCtrl::SetInsertionPoint( long pos ) /* bring editable's cursor uptodate. bug in GTK. */ - GTK_EDITABLE(m_text)->current_pos = pos; + GTK_EDITABLE(m_text)->current_pos = (guint32)pos; } } @@ -591,21 +675,135 @@ void wxTextCtrl::SetEditable( bool editable ) gtk_entry_set_editable( GTK_ENTRY(m_text), editable ); } +bool wxTextCtrl::Enable( bool enable ) +{ + if (!wxWindowBase::Enable(enable)) + { + // nothing to do + return FALSE; + } + + if (m_windowStyle & wxTE_MULTILINE) + { + gtk_text_set_editable( GTK_TEXT(m_text), enable ); + OnParentEnable(enable); + } + else + { + gtk_widget_set_sensitive( m_text, enable ); + } + + return TRUE; +} + +// wxGTK-specific: called recursively by Enable, +// to give widgets an oppprtunity to correct their colours after they +// have been changed by Enable +void wxTextCtrl::OnParentEnable( bool enable ) +{ + // If we have a custom background colour, we use this colour in both + // disabled and enabled mode, or we end up with a different colour under the + // text. + wxColour oldColour = GetBackgroundColour(); + if (oldColour.Ok()) + { + // Need to set twice or it'll optimize the useful stuff out + if (oldColour == * wxWHITE) + SetBackgroundColour(*wxBLACK); + else + SetBackgroundColour(*wxWHITE); + SetBackgroundColour(oldColour); + } +} + void wxTextCtrl::DiscardEdits() { m_modified = FALSE; } +// ---------------------------------------------------------------------------- +// max text length support +// ---------------------------------------------------------------------------- + +void wxTextCtrl::IgnoreNextTextUpdate() +{ + m_ignoreNextUpdate = TRUE; +} + +bool wxTextCtrl::IgnoreTextUpdate() +{ + if ( m_ignoreNextUpdate ) + { + m_ignoreNextUpdate = FALSE; + + return TRUE; + } + + return FALSE; +} + +void wxTextCtrl::SetMaxLength(unsigned long len) +{ + if ( !HasFlag(wxTE_MULTILINE) ) + { + gtk_entry_set_max_length(GTK_ENTRY(m_text), len); + + // there is a bug in GTK+ 1.2.x: "changed" signal is emitted even if + // we had tried to enter more text than allowed by max text length and + // the text wasn't really changed + // + // to detect this and generate TEXT_MAXLEN event instead of + // TEXT_CHANGED one in this case we also catch "insert_text" signal + // + // when max len is set to 0 we disconnect our handler as it means that + // we shouldn't check anything any more + if ( len ) + { + gtk_signal_connect( GTK_OBJECT(m_text), + "insert_text", + GTK_SIGNAL_FUNC(gtk_insert_text_callback), + (gpointer)this); + } + else // no checking + { + gtk_signal_disconnect_by_func + ( + GTK_OBJECT(m_text), + GTK_SIGNAL_FUNC(gtk_insert_text_callback), + (gpointer)this + ); + } + } +} + void wxTextCtrl::SetSelection( long from, long to ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); + if ( (m_windowStyle & wxTE_MULTILINE) && + !GTK_TEXT(m_text)->line_start_cache ) + { + // tell the programmer that it didn't work + wxLogDebug(_T("Can't call SetSelection() before realizing the control")); + return; + } + gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to ); } -void wxTextCtrl::ShowPosition( long WXUNUSED(pos) ) +void wxTextCtrl::ShowPosition( long pos ) { -// SetInsertionPoint( pos ); + if (m_windowStyle & wxTE_MULTILINE) + { + GtkAdjustment *vp = GTK_TEXT(m_text)->vadj; + float totalLines = (float) GetNumberOfLines(); + long posX; + long posY; + PositionToXY(pos, &posX, &posY); + float posLine = (float) posY; + float p = (posLine/totalLines)*(vp->upper - vp->lower) + vp->lower; + gtk_adjustment_set_value(GTK_TEXT(m_text)->vadj, p); + } } long wxTextCtrl::GetInsertionPoint() const @@ -686,27 +884,6 @@ void wxTextCtrl::Paste() #endif } -bool wxTextCtrl::CanCopy() const -{ - // Can copy if there's a selection - long from, to; - GetSelection(& from, & to); - return (from != to) ; -} - -bool wxTextCtrl::CanCut() const -{ - // Can cut if there's a selection - long from, to; - GetSelection(& from, & to); - return (from != to) ; -} - -bool wxTextCtrl::CanPaste() const -{ - return IsEditable() ; -} - // Undo/redo void wxTextCtrl::Undo() { @@ -736,19 +913,34 @@ bool wxTextCtrl::CanRedo() const // If the return values from and to are the same, there is no // selection. -void wxTextCtrl::GetSelection(long* from, long* to) const +void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (!(GTK_EDITABLE(m_text)->has_selection)) + long from, to; + if ( !(GTK_EDITABLE(m_text)->has_selection) ) { - if (from) *from = 0; - if (to) *to = 0; - return; + from = + to = GetInsertionPoint(); + } + else // got selection + { + from = (long) GTK_EDITABLE(m_text)->selection_start_pos; + to = (long) GTK_EDITABLE(m_text)->selection_end_pos; + + if ( from > to ) + { + // exchange them to be compatible with wxMSW + long tmp = from; + from = to; + to = tmp; + } } - if (from) *from = (long) GTK_EDITABLE(m_text)->selection_start_pos; - if (to) *to = (long) GTK_EDITABLE(m_text)->selection_end_pos; + if ( fromOut ) + *fromOut = from; + if ( toOut ) + *toOut = to; } bool wxTextCtrl::IsEditable() const @@ -776,9 +968,31 @@ 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; } + if ((key_event.KeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE)) + { + // This will invoke the dialog default action, such + // as the clicking the default button. + + wxWindow *top_frame = m_parent; + while (top_frame->GetParent() && !(top_frame->IsTopLevel())) + top_frame = top_frame->GetParent(); + + if (top_frame && GTK_IS_WINDOW(top_frame->m_widget)) + { + GtkWindow *window = GTK_WINDOW(top_frame->m_widget); + + if (window->default_widget) + { + gtk_widget_activate (window->default_widget); + return; + } + } + } + key_event.Skip(); } @@ -800,7 +1014,7 @@ bool wxTextCtrl::SetFont( const wxFont &font ) { wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); - if ( !wxWindowBase::SetFont(font) ) + if ( !wxTextCtrlBase::SetFont(font) ) { // font didn't change, nothing to do return FALSE; @@ -808,38 +1022,61 @@ bool wxTextCtrl::SetFont( const wxFont &font ) if ( m_windowStyle & wxTE_MULTILINE ) { - // for compatibility with other ports: the font is a global controls - // characteristic, so change the font globally - wxString value = GetValue(); - if ( !value.IsEmpty() ) - { - Clear(); + m_updateFont = TRUE; - AppendText(value); - } + m_defaultStyle.SetFont(font); + + ChangeFontGlobally(); } return TRUE; } -bool wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) ) +void wxTextCtrl::ChangeFontGlobally() { - wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); + // this method is very inefficient and hence should be called as rarely as + // possible! + wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont, + _T("shouldn't be called for single line controls") ); - // doesn't work - return FALSE; + wxString value = GetValue(); + if ( !value.IsEmpty() ) + { + m_updateFont = FALSE; + + Clear(); + AppendText(value); + } +} + +void wxTextCtrl::UpdateFontIfNeeded() +{ + if ( m_updateFont ) + ChangeFontGlobally(); +} + +bool wxTextCtrl::SetForegroundColour(const wxColour& colour) +{ + if ( !wxControl::SetForegroundColour(colour) ) + return FALSE; + + // update default fg colour too + m_defaultStyle.SetTextColour(colour); + + return TRUE; } bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) { wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); - wxControl::SetBackgroundColour( colour ); + if ( !wxControl::SetBackgroundColour( colour ) ) + return FALSE; if (!m_widget->window) return FALSE; - wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ); + wxColour sysbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ); if (sysbg.Red() == colour.Red() && sysbg.Green() == colour.Green() && sysbg.Blue() == colour.Blue()) @@ -860,9 +1097,66 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) gdk_window_clear( window ); } + // change active background color too + m_defaultStyle.SetBackgroundColour( colour ); + return TRUE; } +bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) +{ + /* VERY dirty way to do that - removes the required text and re-adds it + with styling (FIXME) */ + if ( m_windowStyle & wxTE_MULTILINE ) + { + if ( style.IsDefault() ) + { + // nothing to do + return TRUE; + } + + gint l = gtk_text_get_length( GTK_TEXT(m_text) ); + + wxCHECK_MSG( start >= 0 && end <= l, FALSE, + _T("invalid range in wxTextCtrl::SetStyle") ); + + gint old_pos = gtk_editable_get_position( GTK_EDITABLE(m_text) ); + char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), start, end ); + wxString tmp(text,*wxConvCurrent); + g_free( text ); + + gtk_editable_delete_text( GTK_EDITABLE(m_text), start, end ); + gtk_editable_set_position( GTK_EDITABLE(m_text), start ); + +#if wxUSE_UNICODE + wxWX2MBbuf buf = tmp.mbc_str(); + const char *txt = buf; + size_t txtlen = strlen(buf); +#else + const char *txt = tmp; + size_t txtlen = tmp.length(); +#endif + + // use the attributes from style which are set in it and fall back + // first to the default style and then to the text control default + // colours for the others + wxGtkTextInsert(m_text, + wxTextAttr::Combine(style, m_defaultStyle, this), + txt, + txtlen); + + /* does not seem to help under GTK+ 1.2 !!! + gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */ + SetInsertionPoint( old_pos ); + return TRUE; + } + else // singe line + { + // cannot do this for GTK+'s Entry widget + return FALSE; + } +} + void wxTextCtrl::ApplyWidgetStyle() { if (m_windowStyle & wxTE_MULTILINE) @@ -934,11 +1228,11 @@ void wxTextCtrl::OnInternalIdle() if (cursor.Ok()) { GdkWindow *window = (GdkWindow*) NULL; - if (HasFlag(wxTE_MULTILINE)) + if (HasFlag(wxTE_MULTILINE)) window = GTK_TEXT(m_text)->text_area; else window = GTK_ENTRY(m_text)->text_area; - + if (window) gdk_window_set_cursor( window, cursor.GetCursor() ); @@ -949,4 +1243,91 @@ void wxTextCtrl::OnInternalIdle() if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget))) gdk_window_set_cursor( window, cursor.GetCursor() ); } + + UpdateWindowUI(); +} + +wxSize wxTextCtrl::DoGetBestSize() const +{ + // FIXME should be different for multi-line controls... + wxSize ret( wxControl::DoGetBestSize() ); + return wxSize(80, ret.y); +} + +// ---------------------------------------------------------------------------- +// freeze/thaw +// ---------------------------------------------------------------------------- + +void wxTextCtrl::Freeze() +{ + if ( HasFlag(wxTE_MULTILINE) ) + { + gtk_text_freeze(GTK_TEXT(m_text)); + } +} + +void wxTextCtrl::Thaw() +{ + if ( HasFlag(wxTE_MULTILINE) ) + { + GTK_TEXT(m_text)->vadj->value = 0.0; + + gtk_text_thaw(GTK_TEXT(m_text)); + } +} + +// ---------------------------------------------------------------------------- +// scrolling +// ---------------------------------------------------------------------------- + +GtkAdjustment *wxTextCtrl::GetVAdj() const +{ + return HasFlag(wxTE_MULTILINE) ? GTK_TEXT(m_text)->vadj : NULL; +} + +bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff) +{ + float value = adj->value + diff; + + if ( value < 0 ) + value = 0; + + float upper = adj->upper - adj->page_size; + if ( value > upper ) + value = upper; + + // did we noticeably change the scroll position? + if ( fabs(adj->value - value) < 0.2 ) + { + // well, this is what Robert does in wxScrollBar, so it must be good... + return FALSE; + } + + adj->value = value; + + gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed"); + + return TRUE; +} + +bool wxTextCtrl::ScrollLines(int lines) +{ + GtkAdjustment *adj = GetVAdj(); + if ( !adj ) + return FALSE; + + // this is hardcoded to 10 in GTK+ 1.2 (great idea) + static const int KEY_SCROLL_PIXELS = 10; + + return DoScroll(adj, lines*KEY_SCROLL_PIXELS); +} + +bool wxTextCtrl::ScrollPages(int pages) +{ + GtkAdjustment *adj = GetVAdj(); + if ( !adj ) + return FALSE; + + return DoScroll(adj, (int)ceil(pages*adj->page_increment)); } +