X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ddb394878d390c3eb065f393d9a5664010d9ada..550f38d74380256da7bfcb961d40ff86f677f77e:/src/gtk/textctrl.cpp diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index 08fd4c335c..878b9d06ee 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -42,7 +42,6 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; extern wxCursor g_globalCursor; extern wxWindowGTK *g_delayedFocus; @@ -51,6 +50,24 @@ extern wxWindowGTK *g_delayedFocus; // ---------------------------------------------------------------------------- #ifdef __WXGTK20__ +extern "C" { +static void wxGtkOnRemoveTag(GtkTextBuffer *buffer, + GtkTextTag *tag, + GtkTextIter *start, + GtkTextIter *end, + gpointer user_data) +{ + gchar *name; + g_object_get (tag, "name", &name, NULL); + + if (!name || strncmp(name, "WX", 2)) // anonymous tag or not starting with "WX" + g_signal_stop_emission_by_name(buffer, "remove_tag"); + + g_free(name); +} +} + +extern "C" { static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, const wxTextAttr& attr, GtkTextIter *start, @@ -59,6 +76,11 @@ 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), NULL); + 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; @@ -101,7 +123,9 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer, gtk_text_buffer_apply_tag (text_buffer, tag, start, end); } } +} +extern "C" { static void wxGtkTextInsert(GtkWidget *text, GtkTextBuffer *text_buffer, const wxTextAttr& attr, @@ -120,7 +144,9 @@ static void wxGtkTextInsert(GtkWidget *text, wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter); } +} #else +extern "C" { static void wxGtkTextInsert(GtkWidget *text, const wxTextAttr& attr, const char *txt, @@ -138,6 +164,7 @@ static void wxGtkTextInsert(GtkWidget *text, gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len ); } +} #endif // GTK 1.x // ---------------------------------------------------------------------------- @@ -264,7 +291,7 @@ au_check_word( GtkTextIter *s, GtkTextIter *e ) GtkTextIter start = *s, end = *e; GtkTextBuffer *buffer = gtk_text_iter_get_buffer(s); - + // Get our special link tag GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl"); @@ -601,10 +628,22 @@ bool wxTextCtrl::Create( wxWindow *parent, GtkWrapMode wrap; if ( HasFlag( wxTE_DONTWRAP ) ) wrap = GTK_WRAP_NONE; - else if ( HasFlag( wxTE_LINEWRAP ) ) + else if ( HasFlag( wxTE_CHARWRAP ) ) wrap = GTK_WRAP_CHAR; - else // HasFlag(wxTE_WORDWRAP) always true as wxTE_WORDWRAP == 0 + 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 ); @@ -843,7 +882,7 @@ void wxTextCtrl::CalculateScrollbar() wxString wxTextCtrl::GetValue() const { - wxCHECK_MSG( m_text != NULL, wxT(""), wxT("invalid text ctrl") ); + wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") ); wxString tmp; if (m_windowStyle & wxTE_MULTILINE) @@ -895,6 +934,12 @@ void wxTextCtrl::SetValue( const wxString &value ) if (gtk_text_buffer_get_char_count(m_buffer) != 0) IgnoreNextTextUpdate(); + if ( !buffer ) + { + // what else can we do? at least don't crash... + return; + } + gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) ); #else @@ -990,6 +1035,12 @@ void wxTextCtrl::WriteText( const wxString &text ) #else wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) ); #endif + if ( !buffer ) + { + // what else can we do? at least don't crash... + return; + } + gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len ); #else @@ -1019,7 +1070,7 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const if (text) { - wxString buf(wxT("")); + wxString buf; long i; int currentLine = 0; for (i = 0; currentLine != lineNo && text[i]; i++ ) @@ -1040,12 +1091,12 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const #else GtkTextIter line; gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo); - GtkTextIter end; - gtk_text_buffer_get_end_iter(m_buffer,&end ); + 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.BeforeFirst(wxT('\n')); + return result; #endif } else @@ -1066,6 +1117,15 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const { if ( m_windowStyle & wxTE_MULTILINE ) { +#ifdef __WXGTK20__ + GtkTextIter iter; + gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos); + if (gtk_text_iter_is_end(&iter)) + return false; + + *y = gtk_text_iter_get_line(&iter); + *x = gtk_text_iter_get_line_offset(&iter); +#else wxString text = GetValue(); // cast to prevent warning. But pos really should've been unsigned. @@ -1086,6 +1146,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const else (*x)++; } +#endif } else // single line control { @@ -1108,17 +1169,39 @@ long wxTextCtrl::XYToPosition(long x, long y ) const { if (!(m_windowStyle & wxTE_MULTILINE)) return 0; +#ifdef __WXGTK20__ + GtkTextIter iter; + gtk_text_buffer_get_iter_at_line_offset(m_buffer, &iter, y, x); + return gtk_text_iter_get_offset(&iter); +#else long pos=0; for( int i=0; i last_line) + return -1; + + GtkTextIter iter; + gtk_text_buffer_get_iter_at_line(m_buffer, &iter, lineNo); + // get_chars_in_line return includes paragraph delimiters, so need to subtract 1 IF it is not the last line + return gtk_text_iter_get_chars_in_line(&iter) - ((lineNo == last_line) ? 0 : 1); + } + else +#endif + { + wxString str = GetLineText (lineNo); + return (int) str.Length(); + } } int wxTextCtrl::GetNumberOfLines() const @@ -1459,7 +1542,7 @@ long wxTextCtrl::GetInsertionPoint() const else #endif { - return (long) GET_EDITABLE_POS(m_text); + return (long) GET_EDITABLE_POS(m_text); } } @@ -1673,7 +1756,7 @@ bool wxTextCtrl::IsModified() const void wxTextCtrl::Clear() { - SetValue( wxT("") ); + SetValue( wxEmptyString ); } void wxTextCtrl::OnChar( wxKeyEvent &key_event ) @@ -1844,6 +1927,7 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) // nothing to do return true; } + #ifdef __WXGTK20__ gint l = gtk_text_buffer_get_char_count( m_buffer ); @@ -1860,8 +1944,6 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) wxTextAttr attr = wxTextAttr::Combine(style, m_defaultStyle, this); wxGtkTextApplyTagsFromAttr( m_buffer, attr, &starti, &endi ); - - return true; #else // VERY dirty way to do that - removes the required text and re-adds it // with styling (FIXME) @@ -1879,14 +1961,14 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) gtk_editable_delete_text( GTK_EDITABLE(m_text), start, end ); gtk_editable_set_position( GTK_EDITABLE(m_text), start ); -#if wxUSE_UNICODE + #if wxUSE_UNICODE wxWX2MBbuf buf = tmp.mbc_str(); const char *txt = buf; size_t txtlen = strlen(buf); -#else + #else const char *txt = tmp; size_t txtlen = tmp.length(); -#endif + #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 @@ -1900,13 +1982,13 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style ) gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */ SetInsertionPoint( old_pos ); #endif + return true; } - else // singe line - { - // cannot do this for GTK+'s Entry widget - return false; - } + + // else single line + // cannot do this for GTK+'s Entry widget + return false; } void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style) @@ -2031,7 +2113,7 @@ void wxTextCtrl::Freeze() 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)); - } + } #else gtk_text_freeze(GTK_TEXT(m_text)); #endif