Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch2 of [ 703990 ] attrib support in wxGTK2 textctrl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-08-15 08:17:03 +00:00
parent 2913c590b0
commit a61bbf8767
2 changed files with 12 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gtk/textctrl.cpp
View File

@@ -68,28 +68,16 @@ static void wxGtkTextInsert(GtkWidget *text,
? attr.GetBackgroundColour().GetColor() ? attr.GetBackgroundColour().GetColor()
: NULL; : NULL;
GtkTextIter start, end;
GtkTextMark *mark;
// iterators are invalidated by any mutation that affects 'indexable' buffer contents,
// so we save current position in a mark
// we need a mark of left gravity, so we cannot use
// mark = gtk_text_buffer_get_insert (text_buffer)
gtk_text_buffer_get_iter_at_mark( text_buffer, &start,
gtk_text_buffer_get_insert (text_buffer) );
mark = gtk_text_buffer_create_mark( text_buffer, NULL, &start, TRUE/*left gravity*/ );
gtk_text_buffer_insert_at_cursor( text_buffer, buffer, strlen(buffer) );
gtk_text_buffer_get_iter_at_mark( text_buffer, &end,
gtk_text_buffer_get_insert (text_buffer) );
gtk_text_buffer_get_iter_at_mark( text_buffer, &start, mark );
GtkTextTag *tag; GtkTextTag *tag;
tag = gtk_text_buffer_create_tag( text_buffer, NULL, "font-desc", font_description, tag = gtk_text_buffer_create_tag( text_buffer, NULL, "font-desc", font_description,
"foreground-gdk", colFg, "foreground-gdk", colFg,
"background-gdk", colBg, NULL ); "background-gdk", colBg, NULL );
gtk_text_buffer_apply_tag( text_buffer, tag, &start, &end );
GtkTextIter iter;
gtk_text_buffer_get_iter_at_mark( text_buffer, &iter,
gtk_text_buffer_get_insert (text_buffer) );
gtk_text_buffer_insert_with_tags( text_buffer, &iter, buffer, strlen(buffer), tag, NULL );
} }
#else #else
static void wxGtkTextInsert(GtkWidget *text, static void wxGtkTextInsert(GtkWidget *text,

24
src/gtk1/textctrl.cpp
View File

@@ -68,28 +68,16 @@ static void wxGtkTextInsert(GtkWidget *text,
? attr.GetBackgroundColour().GetColor() ? attr.GetBackgroundColour().GetColor()
: NULL; : NULL;
GtkTextIter start, end;
GtkTextMark *mark;
// iterators are invalidated by any mutation that affects 'indexable' buffer contents,
// so we save current position in a mark
// we need a mark of left gravity, so we cannot use
// mark = gtk_text_buffer_get_insert (text_buffer)
gtk_text_buffer_get_iter_at_mark( text_buffer, &start,
gtk_text_buffer_get_insert (text_buffer) );
mark = gtk_text_buffer_create_mark( text_buffer, NULL, &start, TRUE/*left gravity*/ );
gtk_text_buffer_insert_at_cursor( text_buffer, buffer, strlen(buffer) );
gtk_text_buffer_get_iter_at_mark( text_buffer, &end,
gtk_text_buffer_get_insert (text_buffer) );
gtk_text_buffer_get_iter_at_mark( text_buffer, &start, mark );
GtkTextTag *tag; GtkTextTag *tag;
tag = gtk_text_buffer_create_tag( text_buffer, NULL, "font-desc", font_description, tag = gtk_text_buffer_create_tag( text_buffer, NULL, "font-desc", font_description,
"foreground-gdk", colFg, "foreground-gdk", colFg,
"background-gdk", colBg, NULL ); "background-gdk", colBg, NULL );
gtk_text_buffer_apply_tag( text_buffer, tag, &start, &end );
GtkTextIter iter;
gtk_text_buffer_get_iter_at_mark( text_buffer, &iter,
gtk_text_buffer_get_insert (text_buffer) );
gtk_text_buffer_insert_with_tags( text_buffer, &iter, buffer, strlen(buffer), tag, NULL );
} }
#else #else
static void wxGtkTextInsert(GtkWidget *text, static void wxGtkTextInsert(GtkWidget *text,