X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9440c3d0e95d3ee506a3190c8b31e82d2c98a719..6489e7ee028debbcdb8aae980b503fce7482538b:/src/gtk1/textctrl.cpp

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 680d387243..5ec85604f1 100644
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -144,6 +144,7 @@ static void wxGtkTextInsert(GtkWidget *text,
 // "insert_text" for GtkEntry
 // ----------------------------------------------------------------------------
 
+extern "C" {
 static void
 gtk_insert_text_callback(GtkEditable *editable,
                          const gchar *new_text,
@@ -179,10 +180,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 +196,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 +240,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 )
 {
@@ -287,7 +300,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 +329,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 +361,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 +386,7 @@ au_delete_range_callback(GtkTextBuffer *buffer,
 
     au_check_range(start, end);
 }
+}
 
 
 #endif
@@ -375,6 +395,7 @@ au_delete_range_callback(GtkTextBuffer *buffer,
 //  "changed"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void
 gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
 {
@@ -395,17 +416,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 +437,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 +448,7 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 
     win->CalculateScrollbar();
 }
+}
 #endif
 
 // ----------------------------------------------------------------------------
@@ -444,8 +470,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 +481,7 @@ void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
         gs_gtk_text_draw(widget, rect);
     }
 }
+}
 
 #endif // __WXGTK20__
 
@@ -570,17 +597,36 @@ bool wxTextCtrl::Create( wxWindow *parent,
         // Insert view into scrolled window
         gtk_container_add( GTK_CONTAINER(m_widget), m_text );
 
-        // Global settings which can be overridden by tags, I guess.
-        if (HasFlag( wxHSCROLL ) || HasFlag( wxTE_DONTWRAP ))
-            gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_NONE );
-        else
-            gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_WORD );
+        // translate wx wrapping style to GTK+
+        GtkWrapMode wrap;
+        if ( HasFlag( wxTE_DONTWRAP ) )
+            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 );
 
+        gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK );
+
         GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
-#else
+#else // GTK+ 1
         // create our control ...
         m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
 
@@ -603,7 +649,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
                      GTK_FILL,
                      (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
                      0, 0);
-#endif
+#endif // GTK+ 2/1
     }
     else
     {