Added changes

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

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index f0dad16cff88fcb06a6dc29b7b03d33948ffdbed..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,12 +165,14 @@ static void wxGtkTextInsert(GtkWidget *text,
 
     gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len );
 }
+}
 #endif // GTK 1.x
 
 // ----------------------------------------------------------------------------
 // "insert_text" for GtkEntry
 // ----------------------------------------------------------------------------
 
+extern "C" {
 static void
 gtk_insert_text_callback(GtkEditable *editable,
                          const gchar *new_text,
@@ -179,10 +208,12 @@ gtk_insert_text_callback(GtkEditable *editable,
         win->GetEventHandler()->ProcessEvent( event );
     }
 }
+}
 
 #ifdef __WXGTK20__
 // Implementation of wxTE_AUTO_URL for wxGTK2 by Mart Raudsepp,
 
+extern "C" {
 static void
 au_apply_tag_callback(GtkTextBuffer *buffer,
                       GtkTextTag *tag,
@@ -193,34 +224,43 @@ au_apply_tag_callback(GtkTextBuffer *buffer,
     if(tag == gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl"))
         g_signal_stop_emission_by_name(buffer, "apply_tag");
 }
+}
 
 //-----------------------------------------------------------------------------
 //  GtkTextCharPredicates for gtk_text_iter_*_find_char
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static gboolean
 pred_whitespace (gunichar ch, gpointer user_data)
 {
     return g_unichar_isspace(ch);
 }
+}
 
+extern "C" {
 static gboolean
 pred_non_whitespace (gunichar ch, gpointer user_data)
 {
     return !g_unichar_isspace(ch);
 }
+}
 
+extern "C" {
 static gboolean
 pred_nonpunct (gunichar ch, gpointer user_data)
 {
     return !g_unichar_ispunct(ch);
 }
+}
 
+extern "C" {
 static gboolean
 pred_nonpunct_or_slash (gunichar ch, gpointer user_data)
 {
     return !g_unichar_ispunct(ch) || ch == '/';
 }
+}
 
 //-----------------------------------------------------------------------------
 //  Check for links between s and e and correct tags as necessary
@@ -228,6 +268,7 @@ pred_nonpunct_or_slash (gunichar ch, gpointer user_data)
 
 // This function should be made match better while being efficient at one point.
 // Most probably with a row of regular expressions.
+extern "C" {
 static void
 au_check_word( GtkTextIter *s, GtkTextIter *e )
 {
@@ -251,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");
 
@@ -287,7 +328,9 @@ au_check_word( GtkTextIter *s, GtkTextIter *e )
         g_signal_handler_unblock(buffer, signal_id);
     }
 }
+}
 
+extern "C" {
 static void
 au_check_range(GtkTextIter *s,
                GtkTextIter *range_end)
@@ -314,11 +357,13 @@ au_check_range(GtkTextIter *s,
         gtk_text_iter_forward_find_char(&range_start, pred_non_whitespace, NULL, range_end);
     }
 }
+}
 
 //-----------------------------------------------------------------------------
 //  "insert-text" for GtkTextBuffer
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void
 au_insert_text_callback(GtkTextBuffer *buffer,
                         GtkTextIter *end,
@@ -344,11 +389,13 @@ au_insert_text_callback(GtkTextBuffer *buffer,
 
     au_check_range(&words_start, &words_end);
 }
+}
 
 //-----------------------------------------------------------------------------
 //  "delete-range" for GtkTextBuffer
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void
 au_delete_range_callback(GtkTextBuffer *buffer,
                          GtkTextIter *start,
@@ -367,6 +414,7 @@ au_delete_range_callback(GtkTextBuffer *buffer,
 
     au_check_range(start, end);
 }
+}
 
 
 #endif
@@ -375,6 +423,7 @@ au_delete_range_callback(GtkTextBuffer *buffer,
 //  "changed"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void
 gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
 {
@@ -395,17 +444,20 @@ gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );
 }
+}
 
 //-----------------------------------------------------------------------------
 // "expose_event" from scrolled window and textview
 //-----------------------------------------------------------------------------
 
 #ifdef __WXGTK20__
+extern "C" {
 static gboolean
 gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win )
 {
     return TRUE;
 }
+}
 #endif
 
 //-----------------------------------------------------------------------------
@@ -413,6 +465,7 @@ gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl
 //-----------------------------------------------------------------------------
 
 #ifndef __WXGTK20__
+extern "C" {
 static void
 gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
@@ -423,6 +476,7 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 
     win->CalculateScrollbar();
 }
+}
 #endif
 
 // ----------------------------------------------------------------------------
@@ -444,8 +498,8 @@ extern "C" {
 
 static GtkDrawCallback gs_gtk_text_draw = NULL;
 
-extern "C"
-void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
+extern "C" {
+static void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
 {
     if ( !wxIsInsideYield )
     {
@@ -455,6 +509,7 @@ void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
         gs_gtk_text_draw(widget, rect);
     }
 }
+}
 
 #endif // __WXGTK20__
 
@@ -571,12 +626,27 @@ bool wxTextCtrl::Create( wxWindow *parent,
         gtk_container_add( GTK_CONTAINER(m_widget), m_text );
 
         // translate wx wrapping style to GTK+
+        GtkWrapMode wrap;
         if ( HasFlag( wxTE_DONTWRAP ) )
-            gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_NONE );
-        else if ( HasFlag( wxTE_LINEWRAP ) )
-            gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_CHAR );
-        else // HasFlag(wxTE_WORDWRAP) always true as wxTE_WORDWRAP == 0
-            gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_WORD_CHAR );
+            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 );
 
         if (!HasFlag(wxNO_BORDER))
             gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );
@@ -865,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
@@ -960,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