X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d1fea10d4409e83f8a369c0691198d585b5477f..ba98e032a7d195fc94d3856bcd8f4cf4b4b01b4c:/src/gtk/textctrl.cpp diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index c3b61e8e3e..03d093667c 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -16,27 +16,18 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/utils.h" - #include "wx/panel.h" + #include "wx/settings.h" + #include "wx/math.h" #endif -#include "wx/math.h" -#include "wx/settings.h" #include "wx/strconv.h" #include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo()) #include #include #include -#include "wx/math.h" #include "wx/gtk/private.h" -#include - -//----------------------------------------------------------------------------- -// data -//----------------------------------------------------------------------------- - -extern wxWindowGTK *g_delayedFocus; // ---------------------------------------------------------------------------- // helpers @@ -60,8 +51,26 @@ static void wxGtkOnRemoveTag(GtkTextBuffer *buffer, } } -extern "C" { -static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, +// remove all tags starting with the given prefix from the start..end range +static void +wxGtkTextRemoveTagsWithPrefix(GtkTextBuffer *text_buffer, + const char *prefix, + GtkTextIter *start, + GtkTextIter *end) +{ + gulong remove_handler_id = g_signal_connect + ( + text_buffer, + "remove_tag", + G_CALLBACK(wxGtkOnRemoveTag), + gpointer(prefix) + ); + gtk_text_buffer_remove_all_tags(text_buffer, start, end); + g_signal_handler_disconnect(text_buffer, remove_handler_id); +} + +static void wxGtkTextApplyTagsFromAttr(GtkWidget *text, + GtkTextBuffer *text_buffer, const wxTextAttr& attr, GtkTextIter *start, GtkTextIter *end) @@ -69,17 +78,13 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, static gchar buf[1024]; GtkTextTag *tag; - gulong remove_handler_id = g_signal_connect (text_buffer, "remove_tag", - G_CALLBACK (wxGtkOnRemoveTag), gpointer("WX")); - gtk_text_buffer_remove_all_tags(text_buffer, start, end); - g_signal_handler_disconnect (text_buffer, remove_handler_id); - if (attr.HasFont()) { - char *font_string; + wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFONT", start, end); + PangoFontDescription *font_description = attr.GetFont().GetNativeFontInfo()->description; - font_string = pango_font_description_to_string(font_description); - g_snprintf(buf, sizeof(buf), "WXFONT %s", font_string); + wxGtkString font_string(pango_font_description_to_string(font_description)); + g_snprintf(buf, sizeof(buf), "WXFONT %s", font_string.c_str()); tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ), buf ); if (!tag) @@ -87,7 +92,6 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, "font-desc", font_description, NULL ); gtk_text_buffer_apply_tag (text_buffer, tag, start, end); - g_free (font_string); if (attr.GetFont().GetUnderlined()) { @@ -105,7 +109,9 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, if (attr.HasTextColour()) { - GdkColor *colFg = attr.GetTextColour().GetColor(); + wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFORECOLOR", start, end); + + const GdkColor *colFg = attr.GetTextColour().GetColor(); g_snprintf(buf, sizeof(buf), "WXFORECOLOR %d %d %d", colFg->red, colFg->green, colFg->blue); tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ), @@ -118,7 +124,9 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, if (attr.HasBackgroundColour()) { - GdkColor *colBg = attr.GetBackgroundColour().GetColor(); + wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXBACKCOLOR", start, end); + + const GdkColor *colBg = attr.GetBackgroundColour().GetColor(); g_snprintf(buf, sizeof(buf), "WXBACKCOLOR %d %d %d", colBg->red, colBg->green, colBg->blue); tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ), @@ -137,11 +145,7 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, gtk_text_iter_get_line(start) ); gtk_text_iter_forward_line(¶_end); - remove_handler_id = g_signal_connect (text_buffer, "remove_tag", - G_CALLBACK(wxGtkOnRemoveTag), - gpointer("WXALIGNMENT")); - gtk_text_buffer_remove_all_tags( text_buffer, ¶_start, ¶_end ); - g_signal_handler_disconnect (text_buffer, remove_handler_id); + wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXALIGNMENT", start, end); GtkJustification align; switch (attr.GetAlignment()) @@ -155,7 +159,16 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, case wxTEXT_ALIGNMENT_CENTER: align = GTK_JUSTIFY_CENTER; break; - // gtk+ doesn't support justify as of gtk+-2.7.4 +// gtk+ doesn't support justify before gtk+-2.11.0 with pango-1.17 being available +// (but if new enough pango isn't available it's a mere gtk warning) +#if GTK_CHECK_VERSION(2,11,0) + case wxTEXT_ALIGNMENT_JUSTIFIED: + if (!gtk_check_version(2,11,0)) + align = GTK_JUSTIFY_FILL; + else + align = GTK_JUSTIFY_LEFT; + break; +#endif } g_snprintf(buf, sizeof(buf), "WXALIGNMENT %d", align); @@ -166,10 +179,103 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, "justification", align, NULL ); gtk_text_buffer_apply_tag( text_buffer, tag, ¶_start, ¶_end ); } -} + + if (attr.HasLeftIndent()) + { + // Indentation attribute + + // Clear old indentation tags + GtkTextIter para_start, para_end = *end; + gtk_text_buffer_get_iter_at_line( text_buffer, + ¶_start, + gtk_text_iter_get_line(start) ); + gtk_text_iter_forward_line(¶_end); + + wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXINDENT", start, end); + + // Convert indent from 1/10th of a mm into pixels + float factor; +#if GTK_CHECK_VERSION(2,2,0) + if (!gtk_check_version(2,2,0)) + factor = (float)gdk_screen_get_width(gtk_widget_get_screen(text)) / + gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10; + else +#endif + factor = (float)gdk_screen_width() / gdk_screen_width_mm() / 10; + + const int indent = (int)(factor * attr.GetLeftIndent()); + const int subIndent = (int)(factor * attr.GetLeftSubIndent()); + + gint gindent; + gint gsubindent; + + if (subIndent >= 0) + { + gindent = indent; + gsubindent = -subIndent; + } + else + { + gindent = -subIndent; + gsubindent = indent; + } + + g_snprintf(buf, sizeof(buf), "WXINDENT %d %d", gindent, gsubindent); + tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ), + buf ); + if (!tag) + tag = gtk_text_buffer_create_tag( text_buffer, buf, + "left-margin", gindent, "indent", gsubindent, NULL ); + gtk_text_buffer_apply_tag (text_buffer, tag, ¶_start, ¶_end); + } + + if (attr.HasTabs()) + { + // Set tab stops + + // Clear old tabs + GtkTextIter para_start, para_end = *end; + gtk_text_buffer_get_iter_at_line( text_buffer, + ¶_start, + gtk_text_iter_get_line(start) ); + gtk_text_iter_forward_line(¶_end); + + wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXTABS", start, end); + + const wxArrayInt& tabs = attr.GetTabs(); + + wxString tagname = _T("WXTABS"); + g_snprintf(buf, sizeof(buf), "WXTABS"); + for (size_t i = 0; i < tabs.GetCount(); i++) + tagname += wxString::Format(_T(" %d"), tabs[i]); + + const wxWX2MBbuf buf = tagname.mb_str(wxConvUTF8); + + tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ), + buf ); + if (!tag) + { + // Factor to convert from 1/10th of a mm into pixels + float factor; +#if GTK_CHECK_VERSION(2,2,0) + if (!gtk_check_version(2,2,0)) + factor = (float)gdk_screen_get_width(gtk_widget_get_screen(text)) / + gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10; + else +#endif + factor = (float)gdk_screen_width() / gdk_screen_width_mm() / 10; + + PangoTabArray* tabArray = pango_tab_array_new(tabs.GetCount(), TRUE); + for (size_t i = 0; i < tabs.GetCount(); i++) + pango_tab_array_set_tab(tabArray, i, PANGO_TAB_LEFT, (gint)(tabs[i] * factor)); + tag = gtk_text_buffer_create_tag( text_buffer, buf, + "tabs", tabArray, NULL ); + pango_tab_array_free(tabArray); + } + gtk_text_buffer_apply_tag (text_buffer, tag, ¶_start, ¶_end); + } } -extern "C" { static void wxGtkTextInsert(GtkWidget *text, GtkTextBuffer *text_buffer, const wxTextAttr& attr, @@ -186,8 +292,7 @@ static void wxGtkTextInsert(GtkWidget *text, gtk_text_buffer_get_iter_at_offset (text_buffer, &start, start_offset); - wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter); -} + wxGtkTextApplyTagsFromAttr(text, text_buffer, attr, &start, &iter); } // ---------------------------------------------------------------------------- @@ -202,9 +307,6 @@ gtk_insert_text_callback(GtkEditable *editable, 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); @@ -451,14 +553,52 @@ gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win ) if (!win->m_hasVMT) return; - if (g_isIdle) - wxapp_install_idle_handler(); + if ( win->MarkDirtyOnChange() ) + win->MarkDirty(); - win->SetModified(); + win->SendTextUpdatedEvent(); +} +} + +//----------------------------------------------------------------------------- +// clipboard events: "copy-clipboard", "cut-clipboard", "paste-clipboard" +//----------------------------------------------------------------------------- - wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); +// common part of the event handlers below +static void +handle_text_clipboard_callback( GtkWidget *widget, wxTextCtrl *win, + wxEventType eventType, const gchar * signal_name) +{ + wxClipboardTextEvent event( eventType, win->GetId() ); event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); + if ( win->GetEventHandler()->ProcessEvent( event ) ) + { + // don't let the default processing to take place if we did something + // ourselves in the event handler + g_signal_stop_emission_by_name (widget, signal_name); + } +} + +extern "C" { +static void +gtk_copy_clipboard_callback( GtkWidget *widget, wxTextCtrl *win ) +{ + handle_text_clipboard_callback( + widget, win, wxEVT_COMMAND_TEXT_COPY, "copy-clipboard" ); +} + +static void +gtk_cut_clipboard_callback( GtkWidget *widget, wxTextCtrl *win ) +{ + handle_text_clipboard_callback( + widget, win, wxEVT_COMMAND_TEXT_CUT, "cut-clipboard" ); +} + +static void +gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win ) +{ + handle_text_clipboard_callback( + widget, win, wxEVT_COMMAND_TEXT_PASTE, "paste-clipboard" ); } } @@ -479,9 +619,9 @@ gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl // wxTextCtrl //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase) -BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) +BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase) EVT_CHAR(wxTextCtrl::OnChar) EVT_MENU(wxID_CUT, wxTextCtrl::OnCut) @@ -509,11 +649,16 @@ END_EVENT_TABLE() void wxTextCtrl::Init() { - m_ignoreNextUpdate = + m_dontMarkDirty = m_modified = false; + + m_countUpdatesToIgnore = 0; + SetUpdateFont(false); + m_text = NULL; - m_frozenness = 0; + m_freezeCount = 0; + m_showPositionOnThaw = NULL; m_gdkHandCursor = NULL; m_gdkXTermCursor = NULL; } @@ -549,9 +694,6 @@ bool wxTextCtrl::Create( wxWindow *parent, const wxValidator& validator, const wxString &name ) { - m_needParent = true; - m_acceptsFocus = true; - if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { @@ -568,36 +710,25 @@ bool wxTextCtrl::Create( wxWindow *parent, m_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); + // create "ShowPosition" marker + GtkTextIter iter; + gtk_text_buffer_get_start_iter(m_buffer, &iter); + gtk_text_buffer_create_mark(m_buffer, "ShowPosition", &iter, true); + // create scrolled window m_widget = gtk_scrolled_window_new( NULL, NULL ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( m_widget ), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); + GTK_POLICY_AUTOMATIC, + style & wxTE_NO_VSCROLL + ? GTK_POLICY_NEVER + : GTK_POLICY_AUTOMATIC ); + // for ScrollLines/Pages + m_scrollBar[1] = (GtkRange*)((GtkScrolledWindow*)m_widget)->vscrollbar; // Insert view into scrolled window gtk_container_add( GTK_CONTAINER(m_widget), m_text ); - // translate wx wrapping style to GTK+ - GtkWrapMode wrap; - if ( HasFlag( wxTE_DONTWRAP ) ) - wrap = GTK_WRAP_NONE; - else if ( HasFlag( wxTE_CHARWRAP ) ) - wrap = GTK_WRAP_CHAR; - else if ( HasFlag( wxTE_WORDWRAP ) ) - wrap = GTK_WRAP_WORD; - else // HasFlag(wxTE_BESTWRAP) always true as wxTE_BESTWRAP == 0 - { - // GTK_WRAP_WORD_CHAR seems to be new in GTK+ 2.4 -#ifdef __WXGTK24__ - if ( !gtk_check_version(2,4,0) ) - { - wrap = GTK_WRAP_WORD_CHAR; - } - else -#endif - wrap = GTK_WRAP_WORD; - } - - gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap ); + GTKSetWrapMode(); GtkScrolledWindowSetBorder(m_widget, style); @@ -624,7 +755,6 @@ bool wxTextCtrl::Create( wxWindow *parent, if (multi_line) { gtk_widget_show(m_text); - SetVScrollAdjustment(gtk_scrolled_window_get_vadjustment((GtkScrolledWindow*)m_widget)); } if (!value.empty()) @@ -633,40 +763,14 @@ bool wxTextCtrl::Create( wxWindow *parent, } if (style & wxTE_PASSWORD) - { - if (!multi_line) - gtk_entry_set_visibility( GTK_ENTRY(m_text), FALSE ); - } + GTKSetVisibility(); if (style & wxTE_READONLY) - { - if (!multi_line) - gtk_editable_set_editable( GTK_EDITABLE(m_text), FALSE ); - else - gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE); - } + GTKSetEditable(); - if (multi_line) - { - if (style & wxTE_RIGHT) - gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_RIGHT ); - else if (style & wxTE_CENTRE) - gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_CENTER ); - // Left justify (alignment) is the default and we don't need to apply GTK_JUSTIFY_LEFT - } - else - { -#ifdef __WXGTK24__ - // gtk_entry_set_alignment was introduced in gtk+-2.3.5 - if (!gtk_check_version(2,4,0)) - { - if (style & wxTE_RIGHT) - gtk_entry_set_alignment( GTK_ENTRY(m_text), 1.0 ); - else if (style & wxTE_CENTRE) - gtk_entry_set_alignment( GTK_ENTRY(m_text), 0.5 ); - } -#endif - } + // left justification (alignment) is the default anyhow + if ( style & (wxTE_RIGHT | wxTE_CENTRE) ) + GTKSetJustification(); // We want to be notified about text changes. if (multi_line) @@ -716,83 +820,240 @@ bool wxTextCtrl::Create( wxWindow *parent, G_CALLBACK (gtk_text_changed_callback), this); } - m_cursor = wxCursor( wxCURSOR_IBEAM ); + g_signal_connect (m_text, "copy-clipboard", + G_CALLBACK (gtk_copy_clipboard_callback), this); + g_signal_connect (m_text, "cut-clipboard", + G_CALLBACK (gtk_cut_clipboard_callback), this); + g_signal_connect (m_text, "paste-clipboard", + G_CALLBACK (gtk_paste_clipboard_callback), this); - wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont()); - SetDefaultStyle( attrDef ); + m_cursor = wxCursor( wxCURSOR_IBEAM ); return true; } +// ---------------------------------------------------------------------------- +// flags handling +// ---------------------------------------------------------------------------- -void wxTextCtrl::CalculateScrollbar() +void wxTextCtrl::GTKSetEditable() { + gboolean editable = !HasFlag(wxTE_READONLY); + if ( IsSingleLine() ) + gtk_editable_set_editable(GTK_EDITABLE(m_text), editable); + else + gtk_text_view_set_editable(GTK_TEXT_VIEW(m_text), editable); } +void wxTextCtrl::GTKSetVisibility() +{ + // VZ: shouldn't we assert if wxTE_PASSWORD is set for multiline control? + if ( IsSingleLine() ) + gtk_entry_set_visibility(GTK_ENTRY(m_text), !HasFlag(wxTE_PASSWORD)); +} + +void wxTextCtrl::GTKSetWrapMode() +{ + // no wrapping in single line controls + if ( !IsMultiLine() ) + return; + + // translate wx wrapping style to GTK+ + GtkWrapMode wrap; + if ( HasFlag( wxTE_DONTWRAP ) ) + wrap = GTK_WRAP_NONE; + else if ( HasFlag( wxTE_CHARWRAP ) ) + wrap = GTK_WRAP_CHAR; + else if ( HasFlag( wxTE_WORDWRAP ) ) + wrap = GTK_WRAP_WORD; + else // HasFlag(wxTE_BESTWRAP) always true as wxTE_BESTWRAP == 0 + { + // GTK_WRAP_WORD_CHAR seems to be new in GTK+ 2.4 +#ifdef __WXGTK24__ + if ( !gtk_check_version(2,4,0) ) + { + wrap = GTK_WRAP_WORD_CHAR; + } + else +#endif // __WXGTK24__ + wrap = GTK_WRAP_WORD; + } + + gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap ); +} + +void wxTextCtrl::GTKSetJustification() +{ + if ( IsMultiLine() ) + { + GtkJustification just; + if ( HasFlag(wxTE_RIGHT) ) + just = GTK_JUSTIFY_RIGHT; + else if ( HasFlag(wxTE_CENTRE) ) + just = GTK_JUSTIFY_CENTER; + else // wxTE_LEFT == 0 + just = GTK_JUSTIFY_LEFT; + + gtk_text_view_set_justification(GTK_TEXT_VIEW(m_text), just); + } + else // single line + { +#ifdef __WXGTK24__ + // gtk_entry_set_alignment was introduced in gtk+-2.3.5 + if (!gtk_check_version(2,4,0)) + { + gfloat align; + if ( HasFlag(wxTE_RIGHT) ) + align = 1.0; + else if ( HasFlag(wxTE_CENTRE) ) + align = 0.5; + else // single line + align = 0.0; + + gtk_entry_set_alignment(GTK_ENTRY(m_text), align); + } +#endif // __WXGTK24__ + } + +} + +void wxTextCtrl::SetWindowStyleFlag(long style) +{ + long styleOld = GetWindowStyleFlag(); + + wxTextCtrlBase::SetWindowStyleFlag(style); + + if ( (style & wxTE_READONLY) != (styleOld & wxTE_READONLY) ) + GTKSetEditable(); + + if ( (style & wxTE_PASSWORD) != (styleOld & wxTE_PASSWORD) ) + GTKSetVisibility(); + + static const long flagsWrap = wxTE_WORDWRAP | wxTE_CHARWRAP | wxTE_DONTWRAP; + if ( (style & flagsWrap) != (styleOld & flagsWrap) ) + GTKSetWrapMode(); + + static const long flagsAlign = wxTE_LEFT | wxTE_CENTRE | wxTE_RIGHT; + if ( (style & flagsAlign) != (styleOld & flagsAlign) ) + GTKSetJustification(); +} + +// ---------------------------------------------------------------------------- +// control value +// ---------------------------------------------------------------------------- + wxString wxTextCtrl::GetValue() const { wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") ); wxString tmp; - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { GtkTextIter start; gtk_text_buffer_get_start_iter( m_buffer, &start ); GtkTextIter end; gtk_text_buffer_get_end_iter( m_buffer, &end ); - gchar *text = gtk_text_buffer_get_text( m_buffer, &start, &end, TRUE ); - - const wxWxCharBuffer buf = wxGTK_CONV_BACK(text); - if ( buf ) - tmp = buf; + wxGtkString text(gtk_text_buffer_get_text(m_buffer, &start, &end, true)); - g_free( text ); + return wxGTK_CONV_BACK(text); } else { const gchar *text = gtk_entry_get_text( GTK_ENTRY(m_text) ); - const wxWxCharBuffer buf = wxGTK_CONV_BACK( text ); - if ( buf ) - tmp = buf; + return wxGTK_CONV_BACK(text); } return tmp; } -void wxTextCtrl::SetValue( const wxString &value ) +wxFontEncoding wxTextCtrl::GetTextEncoding() const +{ + // GTK+ uses UTF-8 internally, we need to convert to it but from which + // encoding? + + // first check the default text style (we intentionally don't check the + // style for the current position as it doesn't make sense for SetValue()) + const wxTextAttr& style = GetDefaultStyle(); + wxFontEncoding enc = style.HasFont() ? style.GetFont().GetEncoding() + : wxFONTENCODING_SYSTEM; + + // fall back to the controls font if no style + if ( enc == wxFONTENCODING_SYSTEM && m_hasFont ) + enc = GetFont().GetEncoding(); + + return enc; +} + +bool wxTextCtrl::IsEmpty() const +{ + if ( IsMultiLine() ) + return gtk_text_buffer_get_char_count(m_buffer) == 0; + + return wxTextCtrlBase::IsEmpty(); +} + +void wxTextCtrl::DoSetValue( const wxString &value, int flags ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + // the control won't be modified any more as we programmatically replace + // all the existing text, so reset the flag and don't set it again (and do + // it now, before the text event handler is ran so that IsModified() called + // from there returns the expected value) + m_modified = false; + DontMarkDirtyOnNextChange(); + + wxFontEncoding enc = m_defaultStyle.HasFont() + ? m_defaultStyle.GetFont().GetEncoding() + : wxFONTENCODING_SYSTEM; + if ( enc == wxFONTENCODING_SYSTEM ) + enc = GetTextEncoding(); + + const wxCharBuffer buffer(wxGTK_CONV_ENC(value, enc)); + if ( !buffer ) { - const wxCharBuffer buffer(wxGTK_CONV(value)); - if ( !buffer ) - { - // what else can we do? at least don't crash... - return; - } + // see comment in WriteText() as to why we must warn the user about + // this + wxLogWarning(_("Failed to set text in the text control.")); + return; + } + + // if the control is not empty, two "changed" signals are emitted, + // otherwise only one and we need to ignore either both or one of them + int ignore = flags & SetValue_SendEvent ? 0 : 1; + if ( !IsEmpty() ) + ignore++; - if (gtk_text_buffer_get_char_count(m_buffer) != 0) - IgnoreNextTextUpdate(); + if ( ignore ) + IgnoreNextTextUpdate(ignore); + if ( IsMultiLine() ) + { gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) ); + + if ( !m_defaultStyle.IsDefault() ) + { + GtkTextIter start, end; + gtk_text_buffer_get_bounds( m_buffer, &start, &end ); + wxGtkTextApplyTagsFromAttr(m_widget, m_buffer, m_defaultStyle, + &start, &end); + } } else // single line { - // gtk_entry_set_text() emits two "changed" signals because internally - // it calls gtk_editable_delete_text() and gtk_editable_insert_text() - // but we want to have only one event - IgnoreNextTextUpdate(); - - gtk_entry_set_text( GTK_ENTRY(m_text), wxGTK_CONV(value) ); + gtk_entry_set_text( GTK_ENTRY(m_text), buffer ); } + // if, for whatever reason, the callback wasn't called the expected number + // of times, still reset the flags to the default values + m_dontMarkDirty = false; + m_countUpdatesToIgnore = 0; + + // GRG, Jun/2000: Changed this after a lot of discussion in // the lists. wxWidgets 2.2 will have a set of flags to // customize this behaviour. SetInsertionPoint(0); - - m_modified = false; } void wxTextCtrl::WriteText( const wxString &text ) @@ -802,19 +1063,31 @@ void wxTextCtrl::WriteText( const wxString &text ) if ( text.empty() ) return; - const wxCharBuffer buffer(wxGTK_CONV(text)); + // check if we have a specific style for the current position + wxFontEncoding enc = wxFONTENCODING_SYSTEM; + wxTextAttr style; + if ( GetStyle(GetInsertionPoint(), style) && style.HasFont() ) + { + enc = style.GetFont().GetEncoding(); + } + + if ( enc == wxFONTENCODING_SYSTEM ) + enc = GetTextEncoding(); + + const wxCharBuffer buffer(wxGTK_CONV_ENC(text, enc)); if ( !buffer ) { - // what else can we do? at least don't crash... + // we must log an error here as losing the text like this can be a + // serious problem (e.g. imagine the document edited by user being + // empty instead of containing the correct text) + wxLogWarning(_("Failed to insert text in the control.")); return; } - // gtk_text_changed_callback() will set m_modified to true but m_modified - // shouldn't be changed by the program writing to the text control itself, - // so save the old value and restore when we're done - bool oldModified = m_modified; + // we're changing the text programmatically + DontMarkDirtyOnNextChange(); - if ( m_windowStyle & wxTE_MULTILINE ) + if ( IsMultiLine() ) { // First remove the selection if there is one // TODO: Is there an easier GTK specific way to do this? @@ -828,7 +1101,8 @@ void wxTextCtrl::WriteText( const wxString &text ) GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(m_widget) ); // Scroll to cursor, but only if scrollbar thumb is at the very bottom - if ( wxIsSameDouble(adj->value, adj->upper - adj->page_size) ) + // won't work when frozen, text view is not using m_buffer then + if (!IsFrozen() && wxIsSameDouble(adj->value, adj->upper - adj->page_size)) { gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text), gtk_text_buffer_get_insert( m_buffer ), 0.0, FALSE, 0.0, 1.0 ); @@ -847,8 +1121,6 @@ void wxTextCtrl::WriteText( const wxString &text ) // Bring entry's cursor uptodate. gtk_editable_set_position( GTK_EDITABLE(m_text), len ); } - - m_modified = oldModified; } void wxTextCtrl::AppendText( const wxString &text ) @@ -859,22 +1131,26 @@ void wxTextCtrl::AppendText( const wxString &text ) wxString wxTextCtrl::GetLineText( long lineNo ) const { - if (m_windowStyle & wxTE_MULTILINE) + wxString result; + if ( IsMultiLine() ) { GtkTextIter line; gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo); + GtkTextIter end = line; - gtk_text_iter_forward_to_line_end(&end); - gchar *text = gtk_text_buffer_get_text(m_buffer,&line,&end,TRUE); - wxString result(wxGTK_CONV_BACK(text)); - g_free(text); - return result; + // avoid skipping to the next line end if this one is empty + if ( !gtk_text_iter_ends_line(&line) ) + gtk_text_iter_forward_to_line_end(&end); + + wxGtkString text(gtk_text_buffer_get_text(m_buffer, &line, &end, true)); + result = wxGTK_CONV_BACK(text); } else { - if (lineNo == 0) return GetValue(); - return wxEmptyString; + if (lineNo == 0) + result = GetValue(); } + return result; } void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) ) @@ -886,22 +1162,28 @@ void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) ) bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const { - if ( m_windowStyle & wxTE_MULTILINE ) + if ( IsMultiLine() ) { GtkTextIter iter; - gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos); - if (gtk_text_iter_is_end(&iter)) + + if (pos > GetLastPosition()) return false; - *y = gtk_text_iter_get_line(&iter); - *x = gtk_text_iter_get_line_offset(&iter); + gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos); + + if ( y ) + *y = gtk_text_iter_get_line(&iter); + if ( x ) + *x = gtk_text_iter_get_line_offset(&iter); } else // single line control { if ( pos <= GTK_ENTRY(m_text)->text_length ) { - *y = 0; - *x = pos; + if ( y ) + *y = 0; + if ( x ) + *x = pos; } else { @@ -915,7 +1197,8 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const long wxTextCtrl::XYToPosition(long x, long y ) const { - if (!(m_windowStyle & wxTE_MULTILINE)) return 0; + if ( IsSingleLine() ) + return 0; GtkTextIter iter; if (y >= gtk_text_buffer_get_line_count (m_buffer)) @@ -930,7 +1213,7 @@ long wxTextCtrl::XYToPosition(long x, long y ) const int wxTextCtrl::GetLineLength(long lineNo) const { - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { int last_line = gtk_text_buffer_get_line_count( m_buffer ) - 1; if (lineNo > last_line) @@ -950,33 +1233,9 @@ int wxTextCtrl::GetLineLength(long lineNo) const int wxTextCtrl::GetNumberOfLines() const { - if ( m_windowStyle & wxTE_MULTILINE ) + if ( IsMultiLine() ) { - GtkTextIter iter; - gtk_text_buffer_get_iter_at_offset( m_buffer, &iter, 0 ); - - // move forward by one display line until the end is reached - int lineCount = 1; - while ( gtk_text_view_forward_display_line(GTK_TEXT_VIEW(m_text), &iter) ) - { - lineCount++; - } - - // If the last character in the text buffer is a newline, - // gtk_text_view_forward_display_line() will return false without that - // line being counted. Must add one manually in that case. - GtkTextIter lastCharIter; - gtk_text_buffer_get_iter_at_offset - ( - m_buffer, - &lastCharIter, - gtk_text_buffer_get_char_count(m_buffer) - 1 - ); - gchar lastChar = gtk_text_iter_get_char( &lastCharIter ); - if ( lastChar == wxT('\n') ) - lineCount++; - - return lineCount; + return gtk_text_buffer_get_line_count( m_buffer ); } else // single line { @@ -993,11 +1252,12 @@ void wxTextCtrl::SetInsertionPoint( long pos ) GtkTextIter iter; gtk_text_buffer_get_iter_at_offset( m_buffer, &iter, pos ); gtk_text_buffer_place_cursor( m_buffer, &iter ); - gtk_text_view_scroll_mark_onscreen - ( - GTK_TEXT_VIEW(m_text), - gtk_text_buffer_get_insert( m_buffer ) - ); + GtkTextMark* mark = gtk_text_buffer_get_insert(m_buffer); + if (IsFrozen()) + // defer until Thaw, text view is not using m_buffer now + m_showPositionOnThaw = mark; + else + gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(m_text), mark); } else { @@ -1008,25 +1268,14 @@ void wxTextCtrl::SetInsertionPoint( long pos ) void wxTextCtrl::SetInsertionPointEnd() { - wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - - if (m_windowStyle & wxTE_MULTILINE) - { - GtkTextIter end; - gtk_text_buffer_get_end_iter( m_buffer, &end ); - gtk_text_buffer_place_cursor( m_buffer, &end ); - } - else - { - gtk_editable_set_position( GTK_EDITABLE(m_text), -1 ); - } + SetInsertionPoint(-1); } void wxTextCtrl::SetEditable( bool editable ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { gtk_text_view_set_editable( GTK_TEXT_VIEW(m_text), editable ); } @@ -1044,7 +1293,7 @@ bool wxTextCtrl::Enable( bool enable ) return false; } - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { SetEditable( enable ); } @@ -1057,9 +1306,9 @@ bool wxTextCtrl::Enable( bool enable ) } // wxGTK-specific: called recursively by Enable, -// to give widgets an oppprtunity to correct their colours after they +// to give widgets an opportunity to correct their colours after they // have been changed by Enable -void wxTextCtrl::OnParentEnable( bool enable ) +void wxTextCtrl::OnEnabled( 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 @@ -1090,16 +1339,11 @@ void wxTextCtrl::DiscardEdits() // max text length support // ---------------------------------------------------------------------------- -void wxTextCtrl::IgnoreNextTextUpdate() -{ - m_ignoreNextUpdate = true; -} - bool wxTextCtrl::IgnoreTextUpdate() { - if ( m_ignoreNextUpdate ) + if ( m_countUpdatesToIgnore > 0 ) { - m_ignoreNextUpdate = false; + m_countUpdatesToIgnore--; return true; } @@ -1107,6 +1351,18 @@ bool wxTextCtrl::IgnoreTextUpdate() return false; } +bool wxTextCtrl::MarkDirtyOnChange() +{ + if ( m_dontMarkDirty ) + { + m_dontMarkDirty = false; + + return false; + } + + return true; +} + void wxTextCtrl::SetMaxLength(unsigned long len) { if ( !HasFlag(wxTE_MULTILINE) ) @@ -1145,7 +1401,7 @@ void wxTextCtrl::SetSelection( long from, long to ) to = GetValue().length(); } - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { GtkTextIter fromi, toi; gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from ); @@ -1162,13 +1418,17 @@ void wxTextCtrl::SetSelection( long from, long to ) void wxTextCtrl::ShowPosition( long pos ) { - if (m_windowStyle & wxTE_MULTILINE) + if (IsMultiLine()) { GtkTextIter iter; - gtk_text_buffer_get_start_iter( m_buffer, &iter ); - gtk_text_iter_set_offset( &iter, pos ); - GtkTextMark *mark = gtk_text_buffer_create_mark( m_buffer, NULL, &iter, TRUE ); - gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text), mark, 0.0, FALSE, 0.0, 0.0 ); + gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, int(pos)); + GtkTextMark* mark = gtk_text_buffer_get_mark(m_buffer, "ShowPosition"); + gtk_text_buffer_move_mark(m_buffer, mark, &iter); + if (IsFrozen()) + // defer until Thaw, text view is not using m_buffer now + m_showPositionOnThaw = mark; + else + gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(m_text), mark); } } @@ -1202,7 +1462,7 @@ long wxTextCtrl::GetInsertionPoint() const { wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { // There is no direct accessor for the cursor, but // internally, the cursor is the "mark" called @@ -1226,7 +1486,7 @@ wxTextPos wxTextCtrl::GetLastPosition() const int pos = 0; - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { GtkTextIter end; gtk_text_buffer_get_end_iter( m_buffer, &end ); @@ -1245,7 +1505,7 @@ void wxTextCtrl::Remove( long from, long to ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { GtkTextIter fromi, toi; gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from ); @@ -1274,7 +1534,7 @@ void wxTextCtrl::Cut() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) g_signal_emit_by_name (m_text, "cut-clipboard"); else gtk_editable_cut_clipboard(GTK_EDITABLE(m_text)); @@ -1284,7 +1544,7 @@ void wxTextCtrl::Copy() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) g_signal_emit_by_name (m_text, "copy-clipboard"); else gtk_editable_copy_clipboard(GTK_EDITABLE(m_text)); @@ -1294,7 +1554,7 @@ void wxTextCtrl::Paste() { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) g_signal_emit_by_name (m_text, "paste-clipboard"); else gtk_editable_paste_clipboard(GTK_EDITABLE(m_text)); @@ -1337,7 +1597,7 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const gint to = -1; bool haveSelection = false; - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { GtkTextIter ifrom, ito; if ( gtk_text_buffer_get_selection_bounds(m_buffer, &ifrom, &ito) ) @@ -1378,7 +1638,7 @@ bool wxTextCtrl::IsEditable() const { wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") ); - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text)); } @@ -1402,31 +1662,37 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event ) { wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); - if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxTE_PROCESS_ENTER)) - { - wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); - event.SetEventObject(this); - event.SetString(GetValue()); - if (GetEventHandler()->ProcessEvent(event)) return; - } - - if ((key_event.GetKeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE)) + if ( key_event.GetKeyCode() == WXK_RETURN ) { - // 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 ( HasFlag(wxTE_PROCESS_ENTER) ) + { + wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); + event.SetEventObject(this); + event.SetString(GetValue()); + if ( GetEventHandler()->ProcessEvent(event) ) + return; + } - if (top_frame && GTK_IS_WINDOW(top_frame->m_widget)) + // FIXME: this is not the right place to do it, wxDialog::OnCharHook() + // probably is + if ( IsSingleLine() ) { - GtkWindow *window = GTK_WINDOW(top_frame->m_widget); + // 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 (window->default_widget) + if (top_frame && GTK_IS_WINDOW(top_frame->m_widget)) { - gtk_widget_activate (window->default_widget); - return; + GtkWindow *window = GTK_WINDOW(top_frame->m_widget); + + if (window->default_widget) + { + gtk_widget_activate (window->default_widget); + return; + } } } } @@ -1439,15 +1705,16 @@ GtkWidget* wxTextCtrl::GetConnectWidget() return GTK_WIDGET(m_text); } -bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window ) +GdkWindow *wxTextCtrl::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - if (m_windowStyle & wxTE_MULTILINE) + if ( IsMultiLine() ) { - return window == gtk_text_view_get_window( GTK_TEXT_VIEW( m_text ), GTK_TEXT_WINDOW_TEXT ); // pure guesswork + return gtk_text_view_get_window(GTK_TEXT_VIEW(m_text), + GTK_TEXT_WINDOW_TEXT ); } else { - return (window == GTK_ENTRY(m_text)->text_area); + return GTK_ENTRY(m_text)->text_area; } } @@ -1462,7 +1729,7 @@ bool wxTextCtrl::SetFont( const wxFont &font ) return false; } - if ( m_windowStyle & wxTE_MULTILINE ) + if ( IsMultiLine() ) { SetUpdateFont(true); @@ -1480,7 +1747,7 @@ void wxTextCtrl::ChangeFontGlobally() // possible! // // TODO: it can be implemented much more efficiently for GTK2 - wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE), + wxASSERT_MSG( IsMultiLine(), _T("shouldn't be called for single line controls") ); wxString value = GetValue(); @@ -1522,7 +1789,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour ) bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) { - if ( m_windowStyle & wxTE_MULTILINE ) + if ( IsMultiLine() ) { if ( style.IsDefault() ) { @@ -1539,18 +1806,12 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) gtk_text_buffer_get_iter_at_offset( m_buffer, &starti, start ); gtk_text_buffer_get_iter_at_offset( m_buffer, &endi, end ); - // 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 - wxTextAttr attr = wxTextAttr::Combine(style, m_defaultStyle, this); - - wxGtkTextApplyTagsFromAttr( m_buffer, attr, &starti, &endi ); + wxGtkTextApplyTagsFromAttr( m_widget, m_buffer, style, &starti, &endi ); return true; } + //else: single line text controls don't support styles - // else single line - // cannot do this for GTK+'s Entry widget return false; } @@ -1609,21 +1870,6 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event) event.Enable( CanRedo() ); } -void wxTextCtrl::OnInternalIdle() -{ - if (g_delayedFocus == this) - { - if (GTK_WIDGET_REALIZED(m_widget)) - { - gtk_widget_grab_focus( m_widget ); - g_delayedFocus = NULL; - } - } - - if (wxUpdateUIEvent::CanUpdate(this)) - UpdateWindowUI(wxUPDATE_UI_FROMIDLE); -} - wxSize wxTextCtrl::DoGetBestSize() const { // FIXME should be different for multi-line controls... @@ -1639,9 +1885,11 @@ wxSize wxTextCtrl::DoGetBestSize() const void wxTextCtrl::Freeze() { + wxCHECK_RET(m_text != NULL, wxT("invalid text ctrl")); + if ( HasFlag(wxTE_MULTILINE) ) { - if ( !m_frozenness++ ) + if (m_freezeCount++ == 0) { // freeze textview updates and remove buffer g_signal_connect (m_text, "expose_event", @@ -1650,7 +1898,17 @@ void wxTextCtrl::Freeze() G_CALLBACK (gtk_text_exposed_callback), this); gtk_widget_set_sensitive(m_widget, false); g_object_ref(m_buffer); - gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), gtk_text_buffer_new(NULL)); + GtkTextBuffer* buf_new = gtk_text_buffer_new(NULL); + GtkTextMark* mark = GTK_TEXT_VIEW(m_text)->first_para_mark; + gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), buf_new); + // gtk_text_view_set_buffer adds its own reference + g_object_unref(buf_new); + // This mark should be deleted when the buffer is changed, + // but it's not (in GTK+ up to at least 2.10.6). + // Otherwise these anonymous marks start to build up in the buffer, + // and Freeze takes longer and longer each time it is called. + if (GTK_IS_TEXT_MARK(mark) && !gtk_text_mark_get_deleted(mark)) + gtk_text_buffer_delete_mark(m_buffer, mark); } } } @@ -1659,9 +1917,9 @@ void wxTextCtrl::Thaw() { if ( HasFlag(wxTE_MULTILINE) ) { - wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") ); + wxCHECK_RET(m_freezeCount != 0, _T("Thaw() without matching Freeze()")); - if ( !--m_frozenness ) + if (--m_freezeCount == 0) { // Reattach buffer and thaw textview updates gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), m_buffer); @@ -1671,6 +1929,12 @@ void wxTextCtrl::Thaw() (gpointer) gtk_text_exposed_callback, this); g_signal_handlers_disconnect_by_func (m_text, (gpointer) gtk_text_exposed_callback, this); + if (m_showPositionOnThaw != NULL) + { + gtk_text_view_scroll_mark_onscreen( + GTK_TEXT_VIEW(m_text), m_showPositionOnThaw); + m_showPositionOnThaw = NULL; + } } } } @@ -1685,7 +1949,7 @@ void wxTextCtrl::Thaw() void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event) { event.Skip(); - if(!(m_windowStyle & wxTE_AUTO_URL)) + if( !HasFlag(wxTE_AUTO_URL) ) return; gint x, y; @@ -1728,6 +1992,18 @@ void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event) GetEventHandler()->ProcessEvent(url_event); } +bool wxTextCtrl::GTKProcessEvent(wxEvent& event) const +{ + bool rc = wxTextCtrlBase::GTKProcessEvent(event); + + // GtkTextView starts a drag operation when left mouse button is pressed + // and ends it when it is released and if it doesn't get the release event + // the next click on a control results in an assertion failure inside + // gtk_text_view_start_selection_drag() which simply *kills* the program + // without anything we can do about it, so always let GTK+ have this event + return rc && (IsSingleLine() || event.GetEventType() != wxEVT_LEFT_UP); +} + // static wxVisualAttributes wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))