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

Applied patch [ 1207162 ] wxTextCtrl::SetStyle fix for overlapping calls

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-06-02 08:17:57 +00:00
parent dcd5c3d048
commit 418cf02e34
2 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gtk/textctrl.cpp
View File

@@ -51,6 +51,24 @@ extern wxWindowGTK *g_delayedFocus;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifdef __WXGTK20__ #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, static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
const wxTextAttr& attr, const wxTextAttr& attr,
GtkTextIter *start, GtkTextIter *start,
@@ -59,6 +77,11 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
static gchar buf[1024]; static gchar buf[1024];
GtkTextTag *tag; 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()) if (attr.HasFont())
{ {
char *font_string; char *font_string;
@@ -101,7 +124,9 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
gtk_text_buffer_apply_tag (text_buffer, tag, start, end); gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
} }
} }
}
extern "C" {
static void wxGtkTextInsert(GtkWidget *text, static void wxGtkTextInsert(GtkWidget *text,
GtkTextBuffer *text_buffer, GtkTextBuffer *text_buffer,
const wxTextAttr& attr, const wxTextAttr& attr,
@@ -120,7 +145,9 @@ static void wxGtkTextInsert(GtkWidget *text,
wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter); wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter);
} }
}
#else #else
extern "C" {
static void wxGtkTextInsert(GtkWidget *text, static void wxGtkTextInsert(GtkWidget *text,
const wxTextAttr& attr, const wxTextAttr& attr,
const char *txt, const char *txt,
@@ -138,6 +165,7 @@ static void wxGtkTextInsert(GtkWidget *text,
gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len ); gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len );
} }
}
#endif // GTK 1.x #endif // GTK 1.x
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

28
src/gtk1/textctrl.cpp
View File

@@ -51,6 +51,24 @@ extern wxWindowGTK *g_delayedFocus;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifdef __WXGTK20__ #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, static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
const wxTextAttr& attr, const wxTextAttr& attr,
GtkTextIter *start, GtkTextIter *start,
@@ -59,6 +77,11 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
static gchar buf[1024]; static gchar buf[1024];
GtkTextTag *tag; 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()) if (attr.HasFont())
{ {
char *font_string; char *font_string;
@@ -101,7 +124,9 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
gtk_text_buffer_apply_tag (text_buffer, tag, start, end); gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
} }
} }
}
extern "C" {
static void wxGtkTextInsert(GtkWidget *text, static void wxGtkTextInsert(GtkWidget *text,
GtkTextBuffer *text_buffer, GtkTextBuffer *text_buffer,
const wxTextAttr& attr, const wxTextAttr& attr,
@@ -120,7 +145,9 @@ static void wxGtkTextInsert(GtkWidget *text,
wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter); wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter);
} }
}
#else #else
extern "C" {
static void wxGtkTextInsert(GtkWidget *text, static void wxGtkTextInsert(GtkWidget *text,
const wxTextAttr& attr, const wxTextAttr& attr,
const char *txt, const char *txt,
@@ -138,6 +165,7 @@ static void wxGtkTextInsert(GtkWidget *text,
gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len ); gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len );
} }
}
#endif // GTK 1.x #endif // GTK 1.x
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------