Ignore HtmlHelpController.Destroy() since it owns itself, to avoid

[wxWidgets.git] / src / gtk1 / textctrl.cpp

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 5ec85604f15d1f50a51eac443c850fa5eb3f25cc..40abdc8e96b2e9f0a60094a67a5a8bba0f582edd 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -51,6 +51,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 +77,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 +124,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 +145,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 +165,7 @@ static void wxGtkTextInsert(GtkWidget *text,
 
     gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len );
 }
+}
 #endif // GTK 1.x
 
 // ----------------------------------------------------------------------------
@@ -264,7 +292,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");
 
@@ -907,6 +935,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
@@ -1002,6 +1036,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