]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/textctrl.cpp
removed #errors in 2.7 compilation
[wxWidgets.git] / src / gtk / textctrl.cpp
index b8e19bb2e68dd6b71f0f2c3023abb059f65a18d1..ea62e181859e8f271ae68f646a015a1de94b5927 100644 (file)
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "textctrl.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -42,7 +38,6 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
-extern bool       g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;
 extern wxWindowGTK *g_delayedFocus;
 
@@ -51,6 +46,25 @@ extern wxWindowGTK *g_delayedFocus;
 // ----------------------------------------------------------------------------
 
 #ifdef __WXGTK20__
+extern "C" {
+static void wxGtkOnRemoveTag(GtkTextBuffer *buffer,
+                             GtkTextTag *tag,
+                             GtkTextIter *start,
+                             GtkTextIter *end,
+                             char *prefix)
+{
+    gchar *name;
+    g_object_get (tag, "name", &name, NULL);
+
+    if (!name || strncmp(name, prefix, strlen(prefix)))
+        // anonymous tag or not starting with prefix - don't remove
+        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 +73,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), gpointer("WX"));
+    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;
@@ -100,12 +119,52 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
                                               "background-gdk", colBg, NULL );
         gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
     }
+
+    if (attr.HasAlignment())
+    {
+        GtkTextIter para_start, para_end = *end;
+        gtk_text_buffer_get_iter_at_line( text_buffer,
+                                          &para_start,
+                                          gtk_text_iter_get_line(start) );
+        gtk_text_iter_forward_line(&para_end);
+
+        remove_handler_id = g_signal_connect( text_buffer, "remove_tag",
+                                              G_CALLBACK(wxGtkOnRemoveTag),
+                                              gpointer("WXALIGNMENT"));
+        gtk_text_buffer_remove_all_tags( text_buffer, &para_start, &para_end );
+        g_signal_handler_disconnect( text_buffer, remove_handler_id );
+
+        GtkJustification align;
+        switch (attr.GetAlignment())
+        {
+            default:
+                align = GTK_JUSTIFY_LEFT;
+                break;
+            case wxTEXT_ALIGNMENT_RIGHT:
+                align = GTK_JUSTIFY_RIGHT;
+                break;
+            case wxTEXT_ALIGNMENT_CENTER:
+                align = GTK_JUSTIFY_CENTER;
+                break;
+            // gtk+ doesn't support justify as of gtk+-2.7.4
+        }
+
+        g_snprintf(buf, sizeof(buf), "WXALIGNMENT %d", align);
+        tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
+                                         buf );
+        if (!tag)
+            tag = gtk_text_buffer_create_tag( text_buffer, buf,
+                                              "justification", align, NULL );
+        gtk_text_buffer_apply_tag( text_buffer, tag, &para_start, &para_end );
+    }
+}
 }
 
+extern "C" {
 static void wxGtkTextInsert(GtkWidget *text,
                             GtkTextBuffer *text_buffer,
                             const wxTextAttr& attr,
-                            wxCharBuffer buffer)
+                            const wxCharBuffer& buffer)
 
 {
     gint start_offset;
@@ -120,7 +179,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 +199,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,11 +242,222 @@ 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,
+                      GtkTextIter *start,
+                      GtkTextIter *end,
+                      gpointer textctrl)
+{
+    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
+//-----------------------------------------------------------------------------
+
+// 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 )
+{
+    static const char *URIPrefixes[] =
+    {
+        "http://",
+        "ftp://",
+        "www.",
+        "ftp.",
+        "mailto://",
+        "https://",
+        "file://",
+        "nntp://",
+        "news://",
+        "telnet://",
+        "mms://",
+        "gopher://",
+        "prospero://",
+        "wais://",
+    };
+
+    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");
+
+    // Get rid of punctuation from beginning and end.
+    // Might want to move this to au_check_range if an improved link checking doesn't
+    // use some intelligent punctuation checking itself (beware of undesired iter modifications).
+    if(g_unichar_ispunct( gtk_text_iter_get_char( &start ) ) )
+        gtk_text_iter_forward_find_char( &start, pred_nonpunct, NULL, e );
+
+    gtk_text_iter_backward_find_char( &end, pred_nonpunct_or_slash, NULL, &start );
+    gtk_text_iter_forward_char(&end);
+
+    gchar* text = gtk_text_iter_get_text( &start, &end );
+    size_t len = strlen(text), prefix_len;
+    size_t n;
+
+    for( n = 0; n < WXSIZEOF(URIPrefixes); ++n )
+    {
+        prefix_len = strlen(URIPrefixes[n]);
+        if((len > prefix_len) && !strncasecmp(text, URIPrefixes[n], prefix_len))
+            break;
+    }
+
+    if(n < WXSIZEOF(URIPrefixes))
+    {
+        gulong signal_id = g_signal_handler_find(buffer,
+                                                 (GSignalMatchType) (G_SIGNAL_MATCH_FUNC),
+                                                 0, 0, NULL,
+                                                 (gpointer)au_apply_tag_callback, NULL);
+
+        g_signal_handler_block(buffer, signal_id);
+        gtk_text_buffer_apply_tag(buffer, tag, &start, &end);
+        g_signal_handler_unblock(buffer, signal_id);
+    }
+}
+}
+
+extern "C" {
+static void
+au_check_range(GtkTextIter *s,
+               GtkTextIter *range_end)
+{
+    GtkTextIter range_start = *s;
+    GtkTextIter word_end;
+    GtkTextBuffer *buffer = gtk_text_iter_get_buffer(s);
+    GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl");
+
+    gtk_text_buffer_remove_tag(buffer, tag, s, range_end);
+
+    if(g_unichar_isspace(gtk_text_iter_get_char(&range_start)))
+        gtk_text_iter_forward_find_char(&range_start, pred_non_whitespace, NULL, range_end);
+
+    while(!gtk_text_iter_equal(&range_start, range_end))
+    {
+        word_end = range_start;
+        gtk_text_iter_forward_find_char(&word_end, pred_whitespace, NULL, range_end);
+
+        // Now we should have a word delimited by range_start and word_end, correct link tags
+        au_check_word(&range_start, &word_end);
+
+        range_start = word_end;
+        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,
+                        gchar *text,
+                        gint len,
+                        wxTextCtrl *win)
+{
+    if (!len || !(win->GetWindowStyleFlag() & wxTE_AUTO_URL) )
+        return;
+
+    GtkTextIter start = *end;
+    gtk_text_iter_backward_chars(&start, g_utf8_strlen(text, len));
+
+    GtkTextIter line_start = start;
+    GtkTextIter line_end = *end;
+    GtkTextIter words_start = start;
+    GtkTextIter words_end = *end;
+
+    gtk_text_iter_set_line(&line_start, gtk_text_iter_get_line(&start));
+    gtk_text_iter_forward_to_line_end(&line_end);
+    gtk_text_iter_backward_find_char(&words_start, pred_whitespace, NULL, &line_start);
+    gtk_text_iter_forward_find_char(&words_end, pred_whitespace, NULL, &line_end);
+
+    au_check_range(&words_start, &words_end);
+}
+}
+
+//-----------------------------------------------------------------------------
+//  "delete-range" for GtkTextBuffer
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void
+au_delete_range_callback(GtkTextBuffer *buffer,
+                         GtkTextIter *start,
+                         GtkTextIter *end,
+                         wxTextCtrl *win)
+{
+    if( !(win->GetWindowStyleFlag() & wxTE_AUTO_URL) )
+        return;
+
+    GtkTextIter line_start = *start, line_end = *end;
+
+    gtk_text_iter_set_line(&line_start, gtk_text_iter_get_line(start));
+    gtk_text_iter_forward_to_line_end(&line_end);
+    gtk_text_iter_backward_find_char(start, pred_whitespace, NULL, &line_start);
+    gtk_text_iter_forward_find_char(end, pred_whitespace, NULL, &line_end);
+
+    au_check_range(start, end);
+}
+}
+
+
+#endif
 
 //-----------------------------------------------------------------------------
 //  "changed"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void
 gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
 {
@@ -204,17 +478,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
 
 //-----------------------------------------------------------------------------
@@ -222,6 +499,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 )
 {
@@ -232,6 +510,7 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 
     win->CalculateScrollbar();
 }
+}
 #endif
 
 // ----------------------------------------------------------------------------
@@ -253,8 +532,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 )
     {
@@ -264,6 +543,7 @@ void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
         gs_gtk_text_draw(widget, rect);
     }
 }
+}
 
 #endif // __WXGTK20__
 
@@ -287,6 +567,18 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste)
     EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
+
+#ifdef __WXGTK20__
+    // wxTE_AUTO_URL wxTextUrl support. Currently only creates
+    // wxTextUrlEvent in the same cases as wxMSW, more can be added here.
+    EVT_MOTION      (wxTextCtrl::OnUrlMouseEvent)
+    EVT_LEFT_DOWN   (wxTextCtrl::OnUrlMouseEvent)
+    EVT_LEFT_UP     (wxTextCtrl::OnUrlMouseEvent)
+    EVT_LEFT_DCLICK (wxTextCtrl::OnUrlMouseEvent)
+    EVT_RIGHT_DOWN  (wxTextCtrl::OnUrlMouseEvent)
+    EVT_RIGHT_UP    (wxTextCtrl::OnUrlMouseEvent)
+    EVT_RIGHT_DCLICK(wxTextCtrl::OnUrlMouseEvent)
+#endif
 END_EVENT_TABLE()
 
 void wxTextCtrl::Init()
@@ -298,6 +590,18 @@ void wxTextCtrl::Init()
     m_vScrollbar = (GtkWidget *)NULL;
 #ifdef __WXGTK20__
     m_frozenness = 0;
+    m_gdkHandCursor = NULL;
+    m_gdkXTermCursor = NULL;
+#endif
+}
+
+wxTextCtrl::~wxTextCtrl()
+{
+#ifdef __WXGTK20__
+    if(m_gdkHandCursor)
+        gdk_cursor_unref(m_gdkHandCursor);
+    if(m_gdkXTermCursor)
+        gdk_cursor_unref(m_gdkXTermCursor);
 #endif
 }
 
@@ -355,17 +659,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 );
 
@@ -388,7 +711,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
                      GTK_FILL,
                      (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
                      0, 0);
-#endif
+#endif // GTK+ 2/1
     }
     else
     {
@@ -512,6 +835,42 @@ bool wxTextCtrl::Create( wxWindow *parent,
     {
         g_signal_connect( G_OBJECT(m_buffer), "changed",
             GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+
+        // .. and handle URLs on multi-line controls with wxTE_AUTO_URL style
+        if (style & wxTE_AUTO_URL)
+        {
+            GtkTextIter start, end;
+            m_gdkHandCursor = gdk_cursor_new(GDK_HAND2);
+            m_gdkXTermCursor = gdk_cursor_new(GDK_XTERM);
+
+            // We create our wxUrl tag here for slight efficiency gain - we
+            // don't have to check for the tag existance in callbacks,
+            // hereby it's guaranteed to exist.
+            gtk_text_buffer_create_tag(m_buffer, "wxUrl",
+                                       "foreground", "blue",
+                                       "underline", PANGO_UNDERLINE_SINGLE,
+                                       NULL);
+
+            // Check for URLs after each text change
+            g_signal_connect_after( G_OBJECT(m_buffer), "insert_text",
+                GTK_SIGNAL_FUNC(au_insert_text_callback), (gpointer)this);
+            g_signal_connect_after( G_OBJECT(m_buffer), "delete_range",
+                GTK_SIGNAL_FUNC(au_delete_range_callback), (gpointer)this);
+
+            // Block all wxUrl tag applying unless we do it ourselves, in which case we
+            // block this callback temporarily. This takes care of gtk+ internal
+            // gtk_text_buffer_insert_range* calls that would copy our URL tag otherwise,
+            // which is undesired because only a part of the URL might be copied.
+            // The insert-text signal emitted inside it will take care of newly formed
+            // or wholly copied URLs.
+            g_signal_connect( G_OBJECT(m_buffer), "apply_tag",
+                GTK_SIGNAL_FUNC(au_apply_tag_callback), NULL);
+
+            // Check for URLs in the initial string passed to Create
+            gtk_text_buffer_get_start_iter(m_buffer, &start);
+            gtk_text_buffer_get_end_iter(m_buffer, &end);
+            au_check_range(&start, &end);
+        }
     }
     else
 #endif
@@ -558,7 +917,7 @@ void wxTextCtrl::CalculateScrollbar()
 
 wxString wxTextCtrl::GetValue() const
 {
-    wxCHECK_MSG( m_text != NULL, wxT(""), wxT("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );
 
     wxString tmp;
     if (m_windowStyle & wxTE_MULTILINE)
@@ -610,6 +969,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
@@ -705,6 +1070,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
@@ -734,7 +1105,7 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
 
         if (text)
         {
-            wxString buf(wxT(""));
+            wxString buf;
             long i;
             int currentLine = 0;
             for (i = 0; currentLine != lineNo && text[i]; i++ )
@@ -755,12 +1126,12 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
 #else
         GtkTextIter line;
         gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo);
-        GtkTextIter end;
-        gtk_text_buffer_get_end_iter(m_buffer,&end );
+        GtkTextIter end = line;
+        gtk_text_iter_forward_to_line_end(&end);
         gchar *text = gtk_text_buffer_get_text(m_buffer,&line,&end,TRUE);
         wxString result(wxGTK_CONV_BACK(text));
         g_free(text);
-        return result.BeforeFirst(wxT('\n'));
+        return result;
 #endif
     }
     else
@@ -781,6 +1152,15 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
 {
     if ( m_windowStyle & wxTE_MULTILINE )
     {
+#ifdef __WXGTK20__
+        GtkTextIter iter;
+        gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos);
+        if (gtk_text_iter_is_end(&iter))
+            return false;
+
+        *y = gtk_text_iter_get_line(&iter);
+        *x = gtk_text_iter_get_line_offset(&iter);
+#else
         wxString text = GetValue();
 
         // cast to prevent warning. But pos really should've been unsigned.
@@ -801,6 +1181,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
             else
                 (*x)++;
         }
+#endif
     }
     else // single line control
     {
@@ -823,17 +1204,45 @@ long wxTextCtrl::XYToPosition(long x, long y ) const
 {
     if (!(m_windowStyle & wxTE_MULTILINE)) return 0;
 
+#ifdef __WXGTK20__
+    GtkTextIter iter;
+    if (y >= gtk_text_buffer_get_line_count (m_buffer))
+        return -1;
+
+    gtk_text_buffer_get_iter_at_line(m_buffer, &iter, y);
+    if (x >= gtk_text_iter_get_chars_in_line (&iter))
+        return -1;
+
+    return gtk_text_iter_get_offset(&iter) + x;
+#else
     long pos=0;
     for( int i=0; i<y; i++ ) pos += GetLineLength(i) + 1; // one for '\n'
 
     pos += x;
     return pos;
+#endif
 }
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
-    wxString str = GetLineText (lineNo);
-    return (int) str.Length();
+#ifdef __WXGTK20__
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+        int last_line = gtk_text_buffer_get_line_count( m_buffer ) - 1;
+        if (lineNo > last_line)
+            return -1;
+
+        GtkTextIter iter;
+        gtk_text_buffer_get_iter_at_line(m_buffer, &iter, lineNo);
+        // get_chars_in_line return includes paragraph delimiters, so need to subtract 1 IF it is not the last line
+        return gtk_text_iter_get_chars_in_line(&iter) - ((lineNo == last_line) ? 0 : 1);
+    }
+    else
+#endif
+    {
+        wxString str = GetLineText (lineNo);
+        return (int) str.Length();
+    }
 }
 
 int wxTextCtrl::GetNumberOfLines() const
@@ -1174,7 +1583,7 @@ long wxTextCtrl::GetInsertionPoint() const
     else
 #endif
     {
-    return (long) GET_EDITABLE_POS(m_text);
+        return (long) GET_EDITABLE_POS(m_text);
     }
 }
 
@@ -1388,7 +1797,7 @@ bool wxTextCtrl::IsModified() const
 
 void wxTextCtrl::Clear()
 {
-    SetValue( wxT("") );
+    SetValue( wxEmptyString );
 }
 
 void wxTextCtrl::OnChar( wxKeyEvent &key_event )
@@ -1559,6 +1968,7 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
             // nothing to do
             return true;
         }
+
 #ifdef __WXGTK20__
         gint l = gtk_text_buffer_get_char_count( m_buffer );
 
@@ -1575,8 +1985,6 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
         wxTextAttr attr = wxTextAttr::Combine(style, m_defaultStyle, this);
 
         wxGtkTextApplyTagsFromAttr( m_buffer, attr, &starti, &endi );
-
-        return true;
 #else
         // VERY dirty way to do that - removes the required text and re-adds it
         // with styling (FIXME)
@@ -1594,14 +2002,14 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
         gtk_editable_delete_text( GTK_EDITABLE(m_text), start, end );
         gtk_editable_set_position( GTK_EDITABLE(m_text), start );
 
-#if wxUSE_UNICODE
+    #if wxUSE_UNICODE
         wxWX2MBbuf buf = tmp.mbc_str();
         const char *txt = buf;
         size_t txtlen = strlen(buf);
-#else
+    #else
         const char *txt = tmp;
         size_t txtlen = tmp.length();
-#endif
+    #endif
 
         // use the attributes from style which are set in it and fall back
         // first to the default style and then to the text control default
@@ -1615,13 +2023,13 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
         gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */
         SetInsertionPoint( old_pos );
 #endif
+
         return true;
     }
-    else // singe line
-    {
-        // cannot do this for GTK+'s Entry widget
-        return false;
-    }
+
+    // else single line
+    // cannot do this for GTK+'s Entry widget
+    return false;
 }
 
 void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
@@ -1746,7 +2154,7 @@ void wxTextCtrl::Freeze()
             gtk_widget_set_sensitive(m_widget, false);
             g_object_ref(m_buffer);
             gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), gtk_text_buffer_new(NULL));
-    }
+        }
 #else
         gtk_text_freeze(GTK_TEXT(m_text));
 #endif
@@ -1777,6 +2185,62 @@ void wxTextCtrl::Thaw()
     }
 }
 
+// ----------------------------------------------------------------------------
+// wxTextUrlEvent passing if style & wxTE_AUTO_URL
+// ----------------------------------------------------------------------------
+
+#ifdef __WXGTK20__
+
+// FIXME: when dragging on a link the sample gets an "Unknown event".
+// This might be an excessive event from us or a buggy wxMouseEvent::Moving() or
+// a buggy sample, or something else
+void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event)
+{
+    event.Skip();
+    if(!(m_windowStyle & wxTE_AUTO_URL))
+        return;
+
+    gint x, y;
+    GtkTextIter start, end;
+    GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(m_buffer),
+                                                "wxUrl");
+
+    gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(m_text), GTK_TEXT_WINDOW_WIDGET,
+                                          event.GetX(), event.GetY(), &x, &y);
+
+    gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(m_text), &end, x, y);
+    if (!gtk_text_iter_has_tag(&end, tag))
+    {
+        gdk_window_set_cursor(gtk_text_view_get_window(GTK_TEXT_VIEW(m_text),
+                              GTK_TEXT_WINDOW_TEXT), m_gdkXTermCursor);
+        return;
+    }
+
+    gdk_window_set_cursor(gtk_text_view_get_window(GTK_TEXT_VIEW(m_text),
+                          GTK_TEXT_WINDOW_TEXT), m_gdkHandCursor);
+
+    start = end;
+    if(!gtk_text_iter_begins_tag(&start, tag))
+        gtk_text_iter_backward_to_tag_toggle(&start, tag);
+    if(!gtk_text_iter_ends_tag(&end, tag))
+        gtk_text_iter_forward_to_tag_toggle(&end, tag);
+
+    // Native context menu is probably not desired on an URL.
+    // Consider making this dependant on ProcessEvent(wxTextUrlEvent) return value
+    if(event.GetEventType() == wxEVT_RIGHT_DOWN)
+        event.Skip(false);
+
+    wxTextUrlEvent url_event(m_windowId, event,
+                             gtk_text_iter_get_offset(&start),
+                             gtk_text_iter_get_offset(&end));
+
+    InitCommandEvent(url_event);
+    // Is that a good idea? Seems not (pleasure with gtk_text_view_start_selection_drag)
+    //event.Skip(!GetEventHandler()->ProcessEvent(url_event));
+    GetEventHandler()->ProcessEvent(url_event);
+}
+#endif // gtk2
+
 // ----------------------------------------------------------------------------
 // scrolling
 // ----------------------------------------------------------------------------