]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/textctrl.cpp
new file added
[wxWidgets.git] / src / gtk / textctrl.cpp
index 4da56a23e5cadb20ca2770c2fe5aad4fa35b2c48..eedc7c026f6bbe7f20d79c6406a17285f2bf2868 100644 (file)
 /////////////////////////////////////////////////////////////////////////////
-// Name:        textctrl.cpp
+// Name:        src/gtk/textctrl.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin
+// Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin, 2005 Mart Raudsepp
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "textctrl.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_TEXTCTRL
 
 #include "wx/textctrl.h"
-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+    #include "wx/math.h"
+#endif
+
+#include "wx/scopeguard.h"
+#include "wx/strconv.h"
+#include "wx/fontutil.h"        // for wxNativeFontInfo (GetNativeFontInfo())
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkkeysyms.h"
+#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
+
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------
+
+extern "C" {
+static void wxGtkOnRemoveTag(GtkTextBuffer *buffer,
+                             GtkTextTag *tag,
+                             GtkTextIter * WXUNUSED(start),
+                             GtkTextIter * WXUNUSED(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);
+}
+}
+
+// remove all tags starting with the given prefix from the start..end range
+static void
+wxGtkTextRemoveTagsWithPrefix(GtkTextBuffer *text_buffer,
+                              const char *prefix,
+                              GtkTextIter *start,
+                              GtkTextIter *end)
+{
+    gulong remove_handler_id = g_signal_connect
+                               (
+                                text_buffer,
+                                "remove_tag",
+                                G_CALLBACK(wxGtkOnRemoveTag),
+                                gpointer(prefix)
+                               );
+    gtk_text_buffer_remove_all_tags(text_buffer, start, end);
+    g_signal_handler_disconnect(text_buffer, remove_handler_id);
+}
+
+static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
+                                       GtkTextBuffer *text_buffer,
+                                       const wxTextAttr& attr,
+                                       GtkTextIter *start,
+                                       GtkTextIter *end)
+{
+    static gchar buf[1024];
+    GtkTextTag *tag;
+
+    if (attr.HasFont())
+    {
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFONT", start, end);
+
+        wxFont font(attr.GetFont());
+
+        PangoFontDescription *font_description = font.GetNativeFontInfo()->description;
+        wxGtkString font_string(pango_font_description_to_string(font_description));
+        g_snprintf(buf, sizeof(buf), "WXFONT %s", font_string.c_str());
+        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,
+                                              "font-desc", font_description,
+                                              NULL );
+        gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
+
+        if (font.GetUnderlined())
+        {
+            g_snprintf(buf, sizeof(buf), "WXFONTUNDERLINE");
+            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,
+                                                  "underline-set", TRUE,
+                                                  "underline", PANGO_UNDERLINE_SINGLE,
+                                                  NULL );
+            gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
+        }
+        if ( font.GetStrikethrough() )
+        {
+            g_snprintf(buf, sizeof(buf), "WXFONTSTRIKETHROUGH");
+            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,
+                                                  "strikethrough-set", TRUE,
+                                                  "strikethrough", TRUE,
+                                                  NULL );
+            gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
+        }
+    }
+
+    if (attr.HasTextColour())
+    {
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFORECOLOR", start, end);
+
+        const GdkColor *colFg = attr.GetTextColour().GetColor();
+        g_snprintf(buf, sizeof(buf), "WXFORECOLOR %d %d %d",
+                   colFg->red, colFg->green, colFg->blue);
+        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,
+                                              "foreground-gdk", colFg, NULL );
+        gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
+    }
+
+    if (attr.HasBackgroundColour())
+    {
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXBACKCOLOR", start, end);
+
+        const GdkColor *colBg = attr.GetBackgroundColour().GetColor();
+        g_snprintf(buf, sizeof(buf), "WXBACKCOLOR %d %d %d",
+                   colBg->red, colBg->green, colBg->blue);
+        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,
+                                              "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);
+
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXALIGNMENT", &para_start, &para_end);
+
+        GtkJustification align;
+        switch (attr.GetAlignment())
+        {
+            case wxTEXT_ALIGNMENT_RIGHT:
+                align = GTK_JUSTIFY_RIGHT;
+                break;
+            case wxTEXT_ALIGNMENT_CENTER:
+                align = GTK_JUSTIFY_CENTER;
+                break;
+            case wxTEXT_ALIGNMENT_JUSTIFIED:
+#ifdef __WXGTK3__
+                align = GTK_JUSTIFY_FILL;
+                break;
+#elif GTK_CHECK_VERSION(2,11,0)
+// gtk+ doesn't support justify before gtk+-2.11.0 with pango-1.17 being available
+// (but if new enough pango isn't available it's a mere gtk warning)
+                if (!gtk_check_version(2,11,0))
+                {
+                    align = GTK_JUSTIFY_FILL;
+                    break;
+                }
+                // fallthrough
+#endif
+            default:
+                align = GTK_JUSTIFY_LEFT;
+                break;
+        }
+
+        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 );
+    }
+
+    if (attr.HasLeftIndent())
+    {
+        // Indentation attribute
+
+        // Clear old indentation tags
+        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);
+
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXINDENT", &para_start, &para_end);
+
+        // Convert indent from 1/10th of a mm into pixels
+        float factor =
+            (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
+                      gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;
+
+        const int indent = (int)(factor * attr.GetLeftIndent());
+        const int subIndent = (int)(factor * attr.GetLeftSubIndent());
+
+        gint gindent;
+        gint gsubindent;
+
+        if (subIndent >= 0)
+        {
+            gindent = indent;
+            gsubindent = -subIndent;
+        }
+        else
+        {
+            gindent = -subIndent;
+            gsubindent = indent;
+        }
+
+        g_snprintf(buf, sizeof(buf), "WXINDENT %d %d", gindent, gsubindent);
+        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,
+                                              "left-margin", gindent, "indent", gsubindent, NULL );
+        gtk_text_buffer_apply_tag (text_buffer, tag, &para_start, &para_end);
+    }
+
+    if (attr.HasTabs())
+    {
+        // Set tab stops
+
+        // Clear old tabs
+        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);
+
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXTABS", &para_start, &para_end);
+
+        const wxArrayInt& tabs = attr.GetTabs();
+
+        wxString tagname = wxT("WXTABS");
+        g_snprintf(buf, sizeof(buf), "WXTABS");
+        for (size_t i = 0; i < tabs.GetCount(); i++)
+            tagname += wxString::Format(wxT(" %d"), tabs[i]);
+
+        const wxWX2MBbuf buftag = tagname.utf8_str();
+
+        tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
+                                        buftag );
+        if (!tag)
+        {
+            // Factor to convert from 1/10th of a mm into pixels
+            float factor =
+                (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
+                          gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;
+
+            PangoTabArray* tabArray = pango_tab_array_new(tabs.GetCount(), TRUE);
+            for (size_t i = 0; i < tabs.GetCount(); i++)
+                pango_tab_array_set_tab(tabArray, i, PANGO_TAB_LEFT, (gint)(tabs[i] * factor));
+            tag = gtk_text_buffer_create_tag( text_buffer, buftag,
+                                              "tabs", tabArray, NULL );
+            pango_tab_array_free(tabArray);
+        }
+        gtk_text_buffer_apply_tag (text_buffer, tag, &para_start, &para_end);
+    }
+}
+
+static void wxGtkTextInsert(GtkWidget *text,
+                            GtkTextBuffer *text_buffer,
+                            const wxTextAttr& attr,
+                            const wxCharBuffer& buffer)
+
+{
+    gint start_offset;
+    GtkTextIter iter, start;
+
+    gtk_text_buffer_get_iter_at_mark( text_buffer, &iter,
+                                     gtk_text_buffer_get_insert (text_buffer) );
+    start_offset = gtk_text_iter_get_offset (&iter);
+    gtk_text_buffer_insert( text_buffer, &iter, buffer, strlen(buffer) );
+
+    gtk_text_buffer_get_iter_at_offset (text_buffer, &start, start_offset);
+
+    wxGtkTextApplyTagsFromAttr(text, text_buffer, attr, &start, &iter);
+}
+
+// Implementation of wxTE_AUTO_URL for wxGTK2 by Mart Raudsepp,
+
+extern "C" {
+static void
+au_apply_tag_callback(GtkTextBuffer *buffer,
+                      GtkTextTag *tag,
+                      GtkTextIter * WXUNUSED(start),
+                      GtkTextIter * WXUNUSED(end),
+                      gpointer WXUNUSED(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 WXUNUSED(user_data))
+{
+    return g_unichar_isspace(ch);
+}
+}
+
+extern "C" {
+static gboolean
+pred_non_whitespace (gunichar ch, gpointer WXUNUSED(user_data))
+{
+    return !g_unichar_isspace(ch);
+}
+}
+
+extern "C" {
+static gboolean
+pred_nonpunct (gunichar ch, gpointer WXUNUSED(user_data))
+{
+    return !g_unichar_ispunct(ch);
+}
+}
+
+extern "C" {
+static gboolean
+pred_nonpunct_or_slash (gunichar ch, gpointer WXUNUSED(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 *const 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);
+
+    wxGtkString 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) && !wxStrnicmp(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 * WXUNUSED(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 * WXUNUSED(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);
+}
+}
 
 //-----------------------------------------------------------------------------
-// data
+//  "populate_popup" from text control and "unmap" from its poup menu
 //-----------------------------------------------------------------------------
 
-extern bool   g_blockEventsOnDrag;
+extern "C" {
+static void
+gtk_textctrl_popup_unmap( GtkMenu *WXUNUSED(menu), wxTextCtrl* win )
+{
+    win->GTKEnableFocusOutEvent();
+}
+}
+
+extern "C" {
+static void
+gtk_textctrl_populate_popup( GtkEntry *WXUNUSED(entry), GtkMenu *menu, wxTextCtrl *win )
+{
+    win->GTKDisableFocusOutEvent();
+
+    g_signal_connect (menu, "unmap", G_CALLBACK (gtk_textctrl_popup_unmap), win );
+}
+}
 
 //-----------------------------------------------------------------------------
 //  "changed"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void
 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
-    win->SetModified();
+    if ( win->IgnoreTextUpdate() )
+        return;
 
-    win->CalculateScrollbar();
+    if (!win->m_hasVMT) return;
 
-    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId );
-    event.SetString( win->GetValue() );
-    event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
+    if ( win->MarkDirtyOnChange() )
+        win->MarkDirty();
+
+    win->SendTextUpdatedEvent();
+}
 }
 
 //-----------------------------------------------------------------------------
-// "size_allocate"
+//  clipboard events: "copy-clipboard", "cut-clipboard", "paste-clipboard"
 //-----------------------------------------------------------------------------
 
+// common part of the event handlers below
+static void
+handle_text_clipboard_callback( GtkWidget *widget, wxTextCtrl *win,
+                                wxEventType eventType, const gchar * signal_name)
+{
+    wxClipboardTextEvent event( eventType, win->GetId() );
+    event.SetEventObject( win );
+    if ( win->HandleWindowEvent( event ) )
+    {
+        // don't let the default processing to take place if we did something
+        // ourselves in the event handler
+        g_signal_stop_emission_by_name (widget, signal_name);
+    }
+}
+
+extern "C" {
+static void
+gtk_copy_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
+{
+    handle_text_clipboard_callback(
+        widget, win, wxEVT_COMMAND_TEXT_COPY, "copy-clipboard" );
+}
+
 static void
-gtk_text_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* WXUNUSED(alloc), wxTextCtrl *win )
+gtk_cut_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
 {
-    win->CalculateScrollbar();
+    handle_text_clipboard_callback(
+        widget, win, wxEVT_COMMAND_TEXT_CUT, "cut-clipboard" );
+}
+
+static void
+gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
+{
+    handle_text_clipboard_callback(
+        widget, win, wxEVT_COMMAND_TEXT_PASTE, "paste-clipboard" );
+}
 }
 
 //-----------------------------------------------------------------------------
-//  wxTextCtrl
+//  "mark_set"
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)
+extern "C" {
+static void mark_set(GtkTextBuffer*, GtkTextIter*, GtkTextMark* mark, GSList** markList)
+{
+    if (gtk_text_mark_get_name(mark) == NULL)
+        *markList = g_slist_prepend(*markList, mark);
+}
+}
+
+//-----------------------------------------------------------------------------
+//  wxTextCtrl
+//-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
+
+    EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
+    EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy)
+    EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)
+    EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo)
+    EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo)
+
+    EVT_UPDATE_UI(wxID_CUT, wxTextCtrl::OnUpdateCut)
+    EVT_UPDATE_UI(wxID_COPY, wxTextCtrl::OnUpdateCopy)
+    EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste)
+    EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
+    EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
+
+    // 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)
 END_EVENT_TABLE()
 
-#ifndef NO_TEXT_WINDOW_STREAM
-wxTextCtrl::wxTextCtrl() : streambuf()
+void wxTextCtrl::Init()
 {
-    if (allocate()) setp(base(),ebuf());
+    m_dontMarkDirty =
+    m_modified = false;
+
+    m_countUpdatesToIgnore = 0;
+
+    SetUpdateFont(false);
 
-    m_modified = FALSE;
+    m_text = NULL;
+    m_showPositionOnThaw = NULL;
+    m_anonymousMarkList = NULL;
 }
-#else
-wxTextCtrl::wxTextCtrl()
+
+wxTextCtrl::~wxTextCtrl()
 {
-    m_modified = FALSE;
+    if (m_anonymousMarkList)
+        g_slist_free(m_anonymousMarkList);
 }
-#endif
 
-#ifndef NO_TEXT_WINDOW_STREAM
-wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
-      const wxPoint &pos, const wxSize &size,
-      int style, const wxValidator& validator, const wxString &name ) : streambuf()
+wxTextCtrl::wxTextCtrl( wxWindow *parent,
+                        wxWindowID id,
+                        const wxString &value,
+                        const wxPoint &pos,
+                        const wxSize &size,
+                        long style,
+                        const wxValidator& validator,
+                        const wxString &name )
 {
-    if (allocate()) setp(base(),ebuf());
+    Init();
 
-    m_modified = FALSE;
     Create( parent, id, value, pos, size, style, validator, name );
 }
-#else
-wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
-      const wxPoint &pos, const wxSize &size,
-      int style, const wxValidator& validator, const wxString &name )
-{
-    m_modified = FALSE;
-    Create( parent, id, value, pos, size, style, validator, name );
-}
-#endif
 
-bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
-      const wxPoint &pos, const wxSize &size,
-      int style, const wxValidator& validator, const wxString &name )
+bool wxTextCtrl::Create( wxWindow *parent,
+                         wxWindowID id,
+                         const wxString &value,
+                         const wxPoint &pos,
+                         const wxSize &size,
+                         long style,
+                         const wxValidator& validator,
+                         const wxString &name )
 {
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxTextCtrl creation failed") );
+        return false;
+    }
 
-    PreCreation( parent, id, pos, size, style, name );
+    bool multi_line = (style & wxTE_MULTILINE) != 0;
 
-    SetValidator( validator );
+    if (multi_line)
+    {
+        m_buffer = gtk_text_buffer_new(NULL);
+        gulong sig_id = g_signal_connect(m_buffer, "mark_set", G_CALLBACK(mark_set), &m_anonymousMarkList);
+        // Create view
+        m_text = gtk_text_view_new_with_buffer(m_buffer);
+        // gtk_text_view_set_buffer adds its own reference
+        g_object_unref(m_buffer);
+        g_signal_handler_disconnect(m_buffer, sig_id);
+
+        // create "ShowPosition" marker
+        GtkTextIter iter;
+        gtk_text_buffer_get_start_iter(m_buffer, &iter);
+        gtk_text_buffer_create_mark(m_buffer, "ShowPosition", &iter, true);
+
+        // create scrolled window
+        m_widget = gtk_scrolled_window_new( NULL, NULL );
+        gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( m_widget ),
+                                        GTK_POLICY_AUTOMATIC,
+                                        style & wxTE_NO_VSCROLL
+                                            ? GTK_POLICY_NEVER
+                                            : GTK_POLICY_AUTOMATIC );
+        // for ScrollLines/Pages
+        m_scrollBar[1] = GTK_RANGE(gtk_scrolled_window_get_vscrollbar(GTK_SCROLLED_WINDOW(m_widget)));
+
+        // Insert view into scrolled window
+        gtk_container_add( GTK_CONTAINER(m_widget), m_text );
+
+        GTKSetWrapMode();
+
+        GTKScrolledWindowSetBorder(m_widget, style);
+
+        gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK );
+
+        gtk_widget_set_can_focus(m_widget, FALSE);
+    }
+    else
+    {
+        // a single-line text control: no need for scrollbars
+        m_widget =
+        m_text = gtk_entry_new();
+        // work around probable bug in GTK+ 2.18 when calling WriteText on a
+        // new, empty control, see http://trac.wxwidgets.org/ticket/11409
+        gtk_entry_get_text((GtkEntry*)m_text);
 
-    m_vScrollbarVisible = TRUE;
+        if (style & wxNO_BORDER)
+            g_object_set (m_text, "has-frame", FALSE, NULL);
 
-    bool multi_line = (style & wxTE_MULTILINE) != 0;
-    if ( multi_line )
-    {
-        // a multi-line edit control: create a vertical scrollbar by default and
-        // horizontal if requested
-        bool bHasHScrollbar = (style & wxHSCROLL) != 0;
-
-        // create our control...
-        m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
-
-        // ... and put into the upper left hand corner of the table
-        m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
-        GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
-       
-        gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1,
-                      (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
-                      (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
-                       0, 0);
-
-        // put the horizontal scrollbar in the lower left hand corner
-        if (bHasHScrollbar)
-        {
-            GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj);
-            GTK_WIDGET_UNSET_FLAGS( hscrollbar, GTK_CAN_FOCUS );
-           
-            gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2,
-                       (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
-                       GTK_FILL,
-                       0, 0);
-            gtk_widget_show(hscrollbar);
-        }
+    }
+    g_object_ref(m_widget);
 
-        // finally, put the vertical scrollbar in the upper right corner
-        m_vScrollbar = gtk_vscrollbar_new( GTK_TEXT(m_text)->vadj );
-        GTK_WIDGET_UNSET_FLAGS( m_vScrollbar, GTK_CAN_FOCUS );
-       
-        gtk_table_attach(GTK_TABLE(m_widget), m_vScrollbar, 1, 2, 0, 1,
-                     GTK_FILL,
-                     (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
-                     0, 0);
-        gtk_widget_show( m_vScrollbar );
+    m_parent->DoAddChild( this );
 
-        gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
-          GTK_SIGNAL_FUNC(gtk_text_size_callback), (gpointer)this );
+    m_focusWidget = m_text;
+
+    PostCreation(size);
+
+    if (multi_line)
+    {
+        gtk_widget_show(m_text);
+    }
+
+    // We want to be notified about text changes.
+    if (multi_line)
+    {
+        g_signal_connect (m_buffer, "changed",
+                          G_CALLBACK (gtk_text_changed_callback), this);
     }
     else
     {
-        // a single-line text control: no need for scrollbars
-        m_widget =
-          m_text = gtk_entry_new();
+        g_signal_connect (m_text, "changed",
+                          G_CALLBACK (gtk_text_changed_callback), this);
     }
 
-    wxSize newSize = size;
-    if (newSize.x == -1) newSize.x = 80;
-    if (newSize.y == -1) newSize.y = 26;
-    SetSize( newSize.x, newSize.y );
+    // Catch to disable focus out handling
+    g_signal_connect (m_text, "populate_popup",
+                      G_CALLBACK (gtk_textctrl_populate_popup),
+                      this);
+
+    if (!value.empty())
+    {
+        SetValue( value );
+    }
 
-    m_parent->AddChild( this );
+    if (style & wxTE_PASSWORD)
+        GTKSetVisibility();
 
-    (m_parent->m_insertCallback)( m_parent, this );
+    if (style & wxTE_READONLY)
+        GTKSetEditable();
 
-    PostCreation();
+    // left justification (alignment) is the default anyhow
+    if ( style & (wxTE_RIGHT | wxTE_CENTRE) )
+        GTKSetJustification();
 
     if (multi_line)
     {
-        gtk_widget_realize(m_text);
-        gtk_widget_show(m_text);
+        // Handle URLs on multi-line controls with wxTE_AUTO_URL style
+        if (style & wxTE_AUTO_URL)
+        {
+            GtkTextIter start, end;
+
+            // We create our wxUrl tag here for slight efficiency gain - we
+            // don't have to check for the tag existence 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 (m_buffer, "insert_text",
+                                    G_CALLBACK (au_insert_text_callback), this);
+            g_signal_connect_after (m_buffer, "delete_range",
+                                    G_CALLBACK (au_delete_range_callback), 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 (m_buffer, "apply_tag",
+                              G_CALLBACK (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 // single line
+    {
+        // do the right thing with Enter presses depending on whether we have
+        // wxTE_PROCESS_ENTER or not
+        GTKSetActivatesDefault();
+    }
+
+
+    g_signal_connect (m_text, "copy-clipboard",
+                      G_CALLBACK (gtk_copy_clipboard_callback), this);
+    g_signal_connect (m_text, "cut-clipboard",
+                      G_CALLBACK (gtk_cut_clipboard_callback), this);
+    g_signal_connect (m_text, "paste-clipboard",
+                      G_CALLBACK (gtk_paste_clipboard_callback), this);
+
+    m_cursor = wxCursor( wxCURSOR_IBEAM );
+
+    return true;
+}
+
+GtkEditable *wxTextCtrl::GetEditable() const
+{
+    wxCHECK_MSG( IsSingleLine(), NULL, "shouldn't be called for multiline" );
+
+    return GTK_EDITABLE(m_text);
+}
+
+GtkEntry *wxTextCtrl::GetEntry() const
+{
+    return GTK_ENTRY(m_text);
+}
+
+// ----------------------------------------------------------------------------
+// flags handling
+// ----------------------------------------------------------------------------
+
+void wxTextCtrl::GTKSetEditable()
+{
+    gboolean editable = !HasFlag(wxTE_READONLY);
+    if ( IsSingleLine() )
+        gtk_editable_set_editable(GTK_EDITABLE(m_text), editable);
+    else
+        gtk_text_view_set_editable(GTK_TEXT_VIEW(m_text), editable);
+}
+
+void wxTextCtrl::GTKSetVisibility()
+{
+    wxCHECK_RET( IsSingleLine(),
+                 "wxTE_PASSWORD is for single line text controls only" );
+
+    gtk_entry_set_visibility(GTK_ENTRY(m_text), !HasFlag(wxTE_PASSWORD));
+}
+
+void wxTextCtrl::GTKSetActivatesDefault()
+{
+    wxCHECK_RET( IsSingleLine(),
+                 "wxTE_PROCESS_ENTER is for single line text controls only" );
+
+    gtk_entry_set_activates_default(GTK_ENTRY(m_text),
+                                    !HasFlag(wxTE_PROCESS_ENTER));
+}
+
+void wxTextCtrl::GTKSetWrapMode()
+{
+    // no wrapping in single line controls
+    if ( !IsMultiLine() )
+        return;
+
+    // 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
+        wrap = GTK_WRAP_WORD_CHAR;
+
+    gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );
+}
+
+void wxTextCtrl::GTKSetJustification()
+{
+    if ( IsMultiLine() )
+    {
+        GtkJustification just;
+        if ( HasFlag(wxTE_RIGHT) )
+            just = GTK_JUSTIFY_RIGHT;
+        else if ( HasFlag(wxTE_CENTRE) )
+            just = GTK_JUSTIFY_CENTER;
+        else // wxTE_LEFT == 0
+            just = GTK_JUSTIFY_LEFT;
+
+        gtk_text_view_set_justification(GTK_TEXT_VIEW(m_text), just);
+    }
+    else // single line
+    {
+        gfloat align;
+        if ( HasFlag(wxTE_RIGHT) )
+            align = 1.0;
+        else if ( HasFlag(wxTE_CENTRE) )
+            align = 0.5;
+        else // single line
+            align = 0.0;
+
+        gtk_entry_set_alignment(GTK_ENTRY(m_text), align);
+    }
+}
+
+void wxTextCtrl::SetWindowStyleFlag(long style)
+{
+    long styleOld = GetWindowStyleFlag();
+
+    wxTextCtrlBase::SetWindowStyleFlag(style);
+
+    if ( (style & wxTE_READONLY) != (styleOld & wxTE_READONLY) )
+        GTKSetEditable();
+
+    if ( (style & wxTE_PASSWORD) != (styleOld & wxTE_PASSWORD) )
+        GTKSetVisibility();
+
+    if ( (style & wxTE_PROCESS_ENTER) != (styleOld & wxTE_PROCESS_ENTER) )
+        GTKSetActivatesDefault();
+
+    static const long flagsWrap = wxTE_WORDWRAP | wxTE_CHARWRAP | wxTE_DONTWRAP;
+    if ( (style & flagsWrap) != (styleOld & flagsWrap) )
+        GTKSetWrapMode();
+
+    static const long flagsAlign = wxTE_LEFT | wxTE_CENTRE | wxTE_RIGHT;
+    if ( (style & flagsAlign) != (styleOld & flagsAlign) )
+        GTKSetJustification();
+}
+
+// ----------------------------------------------------------------------------
+// control value
+// ----------------------------------------------------------------------------
+
+wxString wxTextCtrl::GetValue() const
+{
+    wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );
+
+    if ( IsMultiLine() )
+    {
+        GtkTextIter start;
+        gtk_text_buffer_get_start_iter( m_buffer, &start );
+        GtkTextIter end;
+        gtk_text_buffer_get_end_iter( m_buffer, &end );
+        wxGtkString text(gtk_text_buffer_get_text(m_buffer, &start, &end, true));
+
+        return wxGTK_CONV_BACK(text);
+    }
+    else // single line
+    {
+        return wxTextEntry::GetValue();
+    }
+}
+
+wxFontEncoding wxTextCtrl::GetTextEncoding() const
+{
+    // GTK+ uses UTF-8 internally, we need to convert to it but from which
+    // encoding?
+
+    // first check the default text style (we intentionally don't check the
+    // style for the current position as it doesn't make sense for SetValue())
+    const wxTextAttr& style = GetDefaultStyle();
+    wxFontEncoding enc = style.HasFontEncoding() ? style.GetFontEncoding()
+                                         : wxFONTENCODING_SYSTEM;
+
+    // fall back to the controls font if no style
+    if ( enc == wxFONTENCODING_SYSTEM && m_hasFont )
+        enc = GetFont().GetEncoding();
+
+    return enc;
+}
+
+bool wxTextCtrl::IsEmpty() const
+{
+    if ( IsMultiLine() )
+        return gtk_text_buffer_get_char_count(m_buffer) == 0;
+
+    return wxTextEntry::IsEmpty();
+}
+
+void wxTextCtrl::DoSetValue( const wxString &value, int flags )
+{
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
+
+    m_modified = false;
+
+    if ( !IsMultiLine() )
+    {
+        wxTextEntry::DoSetValue(value, flags);
+        return;
+    }
+
+    if (value.IsEmpty())
+    {
+        if ( !(flags & SetValue_SendEvent) )
+            EnableTextChangedEvents(false);
+
+        gtk_text_buffer_set_text( m_buffer, "", 0 );
+
+        if ( !(flags & SetValue_SendEvent) )
+            EnableTextChangedEvents(true);
+
+        return;
+    }
+
+#if wxUSE_UNICODE
+    const wxCharBuffer buffer(value.utf8_str());
+#else
+    wxFontEncoding enc = m_defaultStyle.HasFont()
+                            ? m_defaultStyle.GetFont().GetEncoding()
+                            : wxFONTENCODING_SYSTEM;
+    if ( enc == wxFONTENCODING_SYSTEM )
+        enc = GetTextEncoding();
+
+    const wxCharBuffer buffer(wxGTK_CONV_ENC(value, enc));
+    if ( !buffer )
+    {
+        // see comment in WriteText() as to why we must warn the user about
+        // this
+        wxLogWarning(_("Failed to set text in the text control."));
+        return;
+    }
+#endif
+
+    if ( !(flags & SetValue_SendEvent) )
+    {
+        EnableTextChangedEvents(false);
+    }
+
+    gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
+
+    if ( !m_defaultStyle.IsDefault() )
+    {
+        GtkTextIter start, end;
+        gtk_text_buffer_get_bounds( m_buffer, &start, &end );
+        wxGtkTextApplyTagsFromAttr(m_widget, m_buffer, m_defaultStyle,
+                                   &start, &end);
     }
 
-    // we want to be notified about text changes
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+    if ( !(flags & SetValue_SendEvent) )
+    {
+        EnableTextChangedEvents(true);
+    }
+}
+
+void wxTextCtrl::WriteText( const wxString &text )
+{
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
+
+    // we're changing the text programmatically
+    DontMarkDirtyOnNextChange();
+
+    if ( !IsMultiLine() )
+    {
+        wxTextEntry::WriteText(text);
+        return;
+    }
+
+#if wxUSE_UNICODE
+    const wxCharBuffer buffer(text.utf8_str());
+#else
+    // check if we have a specific style for the current position
+    wxFontEncoding enc = wxFONTENCODING_SYSTEM;
+    wxTextAttr style;
+    if ( GetStyle(GetInsertionPoint(), style) && style.HasFontEncoding() )
+    {
+        enc = style.GetFontEncoding();
+    }
+
+    if ( enc == wxFONTENCODING_SYSTEM )
+        enc = GetTextEncoding();
+
+    const wxCharBuffer buffer(wxGTK_CONV_ENC(text, enc));
+    if ( !buffer )
+    {
+        // we must log an error here as losing the text like this can be a
+        // serious problem (e.g. imagine the document edited by user being
+        // empty instead of containing the correct text)
+        wxLogWarning(_("Failed to insert text in the control."));
+        return;
+    }
+#endif
+
+    // First remove the selection if there is one
+    // TODO:  Is there an easier GTK specific way to do this?
+    long from, to;
+    GetSelection(&from, &to);
+    if (from != to)
+        Remove(from, to);
+
+    // Insert the text
+    wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );
 
-    if (!value.IsEmpty())
+    // Scroll to cursor, but only if scrollbar thumb is at the very bottom
+    // won't work when frozen, text view is not using m_buffer then
+    if (!IsFrozen())
     {
-        gint tmp = 0;
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
-       
-        if (multi_line)
+        GtkAdjustment* adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(m_widget));
+        const double value = gtk_adjustment_get_value(adj);
+        const double upper = gtk_adjustment_get_upper(adj);
+        const double page_size = gtk_adjustment_get_page_size(adj);
+        if (wxIsSameDouble(value, upper - page_size))
         {
-           /* bring editable's cursor uptodate. bug in GTK. */
-       
-           GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
-       }
+            gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(m_text),
+                gtk_text_buffer_get_insert(m_buffer), 0, false, 0, 1);
+        }
     }
+}
 
-    if (style & wxTE_PASSWORD)
+wxString wxTextCtrl::GetLineText( long lineNo ) const
+{
+    wxString result;
+    if ( IsMultiLine() )
     {
-        if (!multi_line)
-            gtk_entry_set_visibility( GTK_ENTRY(m_text), FALSE );
+        GtkTextIter line;
+        gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo);
+
+        GtkTextIter end = line;
+        // avoid skipping to the next line end if this one is empty
+        if ( !gtk_text_iter_ends_line(&line) )
+            gtk_text_iter_forward_to_line_end(&end);
+
+        wxGtkString text(gtk_text_buffer_get_text(m_buffer, &line, &end, true));
+        result = wxGTK_CONV_BACK(text);
+    }
+    else
+    {
+        if (lineNo == 0)
+            result = GetValue();
     }
+    return result;
+}
 
-    if (style & wxTE_READONLY)
+void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
+{
+  /* If you implement this, don't forget to update the documentation!
+   * (file docs/latex/wx/text.tex) */
+    wxFAIL_MSG( wxT("wxTextCtrl::OnDropFiles not implemented") );
+}
+
+bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
+{
+    if ( IsMultiLine() )
+    {
+        GtkTextIter iter;
+
+        if (pos > GetLastPosition())
+            return false;
+
+        gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos);
+
+        if ( y )
+            *y = gtk_text_iter_get_line(&iter);
+        if ( x )
+            *x = gtk_text_iter_get_line_offset(&iter);
+    }
+    else // single line control
     {
-        if (!multi_line)
-            gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
+        if (pos <= gtk_entry_get_text_length(GTK_ENTRY(m_text)))
+        {
+            if ( y )
+                *y = 0;
+            if ( x )
+                *x = pos;
+        }
+        else
+        {
+            // index out of bounds
+            return false;
+        }
+    }
+
+    return true;
+}
+
+long wxTextCtrl::XYToPosition(long x, long y ) const
+{
+    if ( IsSingleLine() )
+        return 0;
+
+    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;
+}
+
+int wxTextCtrl::GetLineLength(long lineNo) const
+{
+    if ( IsMultiLine() )
+    {
+        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
     {
-        if (multi_line)
-            gtk_text_set_editable( GTK_TEXT(m_text), 1 );
+        wxString str = GetLineText (lineNo);
+        return (int) str.length();
+    }
+}
+
+wxPoint wxTextCtrl::DoPositionToCoords(long pos) const
+{
+    if ( !IsMultiLine() )
+    {
+        // Single line text entry (GtkTextEntry) doesn't have support for
+        // getting the coordinates for the given offset. Perhaps we could
+        // find them ourselves by using GetTextExtent() but for now just leave
+        // it unimplemented, this function is more useful for multiline
+        // controls anyhow.
+        return wxDefaultPosition;
     }
 
-    Show( TRUE );
+    // Window coordinates for the given position is calculated by getting
+    // the buffer coordinates and converting them to window coordinates.
+    GtkTextView *textview = GTK_TEXT_VIEW(m_text);
 
-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
+    GtkTextIter iter;
+    gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos);
 
-    return TRUE;
-}
+    GdkRectangle bufferCoords;
+    gtk_text_view_get_iter_location(textview, &iter, &bufferCoords);
 
-void wxTextCtrl::CalculateScrollbar()
-{
-    if ((m_windowStyle & wxTE_MULTILINE) == 0) return;
+    gint winCoordX = 0,
+         winCoordY = 0;
+    gtk_text_view_buffer_to_window_coords(textview, GTK_TEXT_WINDOW_WIDGET,
+                                          bufferCoords.x, bufferCoords.y,
+                                          &winCoordX, &winCoordY);
 
-    GtkAdjustment *adj = GTK_TEXT(m_text)->vadj;
+    return wxPoint(winCoordX, winCoordY);
+}
 
-    if (adj->upper - adj->page_size < 0.8)
+int wxTextCtrl::GetNumberOfLines() const
+{
+    if ( IsMultiLine() )
     {
-        if (m_vScrollbarVisible)
-        {
-        gtk_widget_hide( m_vScrollbar );
-
-        m_vScrollbarVisible = FALSE;
-        }
+        return gtk_text_buffer_get_line_count( m_buffer );
     }
-    else
+    else // single line
     {
-        if (!m_vScrollbarVisible)
-        {
-        gtk_widget_show( m_vScrollbar );
-
-        m_vScrollbarVisible = TRUE;
-        }
+        return 1;
     }
 }
 
-wxString wxTextCtrl::GetValue() const
+void wxTextCtrl::SetInsertionPoint( long pos )
 {
-    wxCHECK_MSG( m_text != NULL, "", "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
-    wxString tmp;
-    if (m_windowStyle & wxTE_MULTILINE)
+    if ( IsMultiLine() )
     {
-        gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-        char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
-        tmp = text;
-        g_free( text );
+        GtkTextIter iter;
+        gtk_text_buffer_get_iter_at_offset( m_buffer, &iter, pos );
+        gtk_text_buffer_place_cursor( m_buffer, &iter );
+        GtkTextMark* mark = gtk_text_buffer_get_insert(m_buffer);
+        if (IsFrozen())
+            // defer until Thaw, text view is not using m_buffer now
+            m_showPositionOnThaw = mark;
+        else
+            gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(m_text), mark);
     }
-    else
+    else // single line
     {
-        tmp = gtk_entry_get_text( GTK_ENTRY(m_text) );
+        wxTextEntry::SetInsertionPoint(pos);
     }
-    return tmp;
 }
 
-void wxTextCtrl::SetValue( const wxString &value )
+void wxTextCtrl::SetEditable( bool editable )
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
-    wxString tmp = "";
-    if (!value.IsNull()) tmp = value;
-    if (m_windowStyle & wxTE_MULTILINE)
+    if ( IsMultiLine() )
     {
-        gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-        gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len );
-        len = 0;
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), tmp, tmp.Length(), &len );
+        gtk_text_view_set_editable( GTK_TEXT_VIEW(m_text), editable );
     }
-    else
+    else // single line
     {
-        gtk_entry_set_text( GTK_ENTRY(m_text), tmp );
+        wxTextEntry::SetEditable(editable);
     }
 }
 
-void wxTextCtrl::WriteText( const wxString &text )
+bool wxTextCtrl::Enable( bool enable )
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
-
-    if (text.IsNull()) return;
-
-    if (m_windowStyle & wxTE_MULTILINE)
+    if (!wxWindowBase::Enable(enable))
     {
-        /* this moves the cursor pos to behind the inserted text */
-       gint len = GTK_EDITABLE(m_text)->current_pos;
-       
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
-       
-       /* bring editable's cursor uptodate. bug in GTK. */
-       GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
-    }
-    else
-    {
-        /* this moves the cursor pos to behind the inserted text */
-       gint len = GTK_EDITABLE(m_text)->current_pos;
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
-       
-       /* bring editable's cursor uptodate. bug in GTK. */
-       GTK_EDITABLE(m_text)->current_pos += text.Len();
-       
-       /* bring entry's cursor uptodate. bug in GTK. */
-       gtk_entry_set_position( GTK_ENTRY(m_text), GTK_EDITABLE(m_text)->current_pos );
+        // nothing to do
+        return false;
     }
+
+    gtk_widget_set_sensitive( m_text, enable );
+    SetCursor(enable ? wxCursor(wxCURSOR_IBEAM) : wxCursor());
+
+    return true;
 }
 
-void wxTextCtrl::AppendText( const wxString &text )
+// wxGTK-specific: called recursively by Enable,
+// to give widgets an opportunity to correct their colours after they
+// have been changed by Enable
+void wxTextCtrl::OnEnabled(bool WXUNUSED(enable))
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
-
-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-        /* we'll insert at the last position */
-        gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
-       
-       /* bring editable's cursor uptodate. bug in GTK. */
-       GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
-    }
-    else
+    // If we have a custom background colour, we use this colour in both
+    // disabled and enabled mode, or we end up with a different colour under the
+    // text.
+    wxColour oldColour = GetBackgroundColour();
+    if (oldColour.IsOk())
     {
-        gtk_entry_append_text( GTK_ENTRY(m_text), text );
+        // Need to set twice or it'll optimize the useful stuff out
+        if (oldColour == * wxWHITE)
+            SetBackgroundColour(*wxBLACK);
+        else
+            SetBackgroundColour(*wxWHITE);
+        SetBackgroundColour(oldColour);
     }
 }
 
-bool wxTextCtrl::LoadFile( const wxString &file )
+void wxTextCtrl::MarkDirty()
 {
-  wxCHECK_MSG( m_text != NULL, FALSE, "invalid text ctrl" );
-
-  if (!wxFileExists(file)) return FALSE;
+    m_modified = true;
+}
 
-  Clear();
+void wxTextCtrl::DiscardEdits()
+{
+    m_modified = false;
+}
 
-  FILE *fp = (FILE*) NULL;
-  struct stat statb;
+// ----------------------------------------------------------------------------
+// event handling
+// ----------------------------------------------------------------------------
 
-  if ((stat ((char*) (const char*) file, &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||
-      !(fp = fopen ((char*) (const char*) file, "r")))
-  {
-      return FALSE;
-  }
-  else
-  {
-    gint len = statb.st_size;
-    char *text;
-    if (!(text = (char*)malloc ((unsigned) (len + 1))))
+void wxTextCtrl::EnableTextChangedEvents(bool enable)
+{
+    if ( enable )
     {
-      fclose (fp);
-      return FALSE;
+        g_signal_handlers_unblock_by_func(GetTextObject(),
+            (gpointer)gtk_text_changed_callback, this);
     }
-    if (fread (text, sizeof (char), len, fp) != (size_t) len)
+    else // disable events
     {
+        g_signal_handlers_block_by_func(GetTextObject(),
+            (gpointer)gtk_text_changed_callback, this);
     }
-    fclose (fp);
-
-    text[len] = 0;
+}
 
-    if (m_windowStyle & wxTE_MULTILINE)
+bool wxTextCtrl::IgnoreTextUpdate()
+{
+    if ( m_countUpdatesToIgnore > 0 )
     {
-      gint pos = 0;
-      gtk_editable_insert_text( GTK_EDITABLE(m_text), text, len, &pos );
+        m_countUpdatesToIgnore--;
+
+        return true;
     }
-    else
+
+    return false;
+}
+
+bool wxTextCtrl::MarkDirtyOnChange()
+{
+    if ( m_dontMarkDirty )
     {
-      gtk_entry_set_text( GTK_ENTRY(m_text), text );
+        m_dontMarkDirty = false;
+
+        return false;
     }
 
-    free (text);
-    m_modified = FALSE;
-    return TRUE;
-  }
-  return FALSE;
+    return true;
 }
 
-bool wxTextCtrl::SaveFile( const wxString &file )
+void wxTextCtrl::SetSelection( long from, long to )
 {
-  wxCHECK_MSG( m_text != NULL, FALSE, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
-  if (file == "") return FALSE;
+    if ( IsMultiLine() )
+    {
+        if (from == -1 && to == -1)
+        {
+            from = 0;
+            to = GetValue().length();
+        }
 
-  FILE *fp;
+        GtkTextIter fromi, toi;
+        gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from );
+        gtk_text_buffer_get_iter_at_offset( m_buffer, &toi, to );
 
-  if (!(fp = fopen ((char*) (const char*) file, "w")))
+        gtk_text_buffer_select_range( m_buffer, &fromi, &toi );
+    }
+    else // single line
     {
-      return FALSE;
+        wxTextEntry::SetSelection(from, to);
     }
-  else
+}
+
+void wxTextCtrl::ShowPosition( long pos )
+{
+    if (IsMultiLine())
     {
-      char *text = (char*) NULL;
-      gint len = 0;
+        GtkTextIter iter;
+        gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, int(pos));
+        GtkTextMark* mark = gtk_text_buffer_get_mark(m_buffer, "ShowPosition");
+        gtk_text_buffer_move_mark(m_buffer, mark, &iter);
+        if (IsFrozen())
+            // defer until Thaw, text view is not using m_buffer now
+            m_showPositionOnThaw = mark;
+        else
+            gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(m_text), mark);
+    }
+}
 
-      if (m_windowStyle & wxTE_MULTILINE)
-      {
-        len = gtk_text_get_length( GTK_TEXT(m_text) );
-        text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
-      }
-      else
-      {
-        text = gtk_entry_get_text( GTK_ENTRY(m_text) );
-      }
+wxTextCtrlHitTestResult
+wxTextCtrl::HitTest(const wxPoint& pt, long *pos) const
+{
+    if ( !IsMultiLine() )
+    {
+        // not supported
+        return wxTE_HT_UNKNOWN;
+    }
 
-      if (fwrite (text, sizeof (char), len, fp) != (size_t) len)
-      {
-          // Did not write whole file
-      }
+    int x, y;
+    gtk_text_view_window_to_buffer_coords
+    (
+        GTK_TEXT_VIEW(m_text),
+        GTK_TEXT_WINDOW_TEXT,
+        pt.x, pt.y,
+        &x, &y
+    );
+
+    GtkTextIter iter;
+    gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(m_text), &iter, x, y);
+    if ( pos )
+        *pos = gtk_text_iter_get_offset(&iter);
+
+    return wxTE_HT_ON_TEXT;
+}
 
-      // Make sure newline terminates the file
-      if (text[len - 1] != '\n')
-          fputc ('\n', fp);
+long wxTextCtrl::GetInsertionPoint() const
+{
+    wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
 
-      fclose (fp);
+    if ( IsMultiLine() )
+    {
+        // There is no direct accessor for the cursor, but
+        // internally, the cursor is the "mark" called
+        // "insert" in the text view's btree structure.
 
-      if (m_windowStyle & wxTE_MULTILINE) g_free( text );
+        GtkTextMark *mark = gtk_text_buffer_get_insert( m_buffer );
+        GtkTextIter cursor;
+        gtk_text_buffer_get_iter_at_mark( m_buffer, &cursor, mark );
 
-      m_modified = FALSE;
-      return TRUE;
+        return gtk_text_iter_get_offset( &cursor );
+    }
+    else
+    {
+        return wxTextEntry::GetInsertionPoint();
     }
-
-  return TRUE;
 }
 
-wxString wxTextCtrl::GetLineText( long lineNo ) const
+wxTextPos wxTextCtrl::GetLastPosition() const
 {
-  if (m_windowStyle & wxTE_MULTILINE)
-  {
-    gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-    char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
+    wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
 
-    if (text)
+    int pos = 0;
+
+    if ( IsMultiLine() )
     {
-        wxString buf("");
-        long i;
-        int currentLine = 0;
-        for (i = 0; currentLine != lineNo && text[i]; i++ )
-          if (text[i] == '\n')
-            currentLine++;
-        // Now get the text
-        int j;
-        for (j = 0; text[i] && text[i] != '\n'; i++, j++ )
-            buf += text[i];
+        GtkTextIter end;
+        gtk_text_buffer_get_end_iter( m_buffer, &end );
 
-        g_free( text );
-        return buf;
+        pos = gtk_text_iter_get_offset( &end );
+    }
+    else // single line
+    {
+        pos = wxTextEntry::GetLastPosition();
     }
-    else
-      return wxEmptyString;
-  }
-  else
-  {
-    if (lineNo == 0) return GetValue();
-    return wxEmptyString;
-  }
-}
 
-void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
-{
-  /* If you implement this, don't forget to update the documentation!
-   * (file docs/latex/wx/text.tex) */
-    wxFAIL_MSG( "wxTextCtrl::OnDropFiles not implemented" );
+    return (long)pos;
 }
 
-long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
+void wxTextCtrl::Remove( long from, long to )
 {
-    if ( m_windowStyle & wxTE_MULTILINE )
-    {
-        wxString text = GetValue();
-
-        // cast to prevent warning. But pos really should've been unsigned.
-        if( (unsigned long)pos > text.Len()  )
-            return FALSE;
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
-        *x=0;   // First Col
-        *y=0;   // First Line
+    if ( IsMultiLine() )
+    {
+        GtkTextIter fromi, toi;
+        gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from );
+        gtk_text_buffer_get_iter_at_offset( m_buffer, &toi, to );
 
-        const char* stop = text.c_str() + pos;
-        for ( const char *p = text.c_str(); p < stop; p++ )
-        {
-            if (*p == '\n')
-            {
-                (*y)++;
-                *x=0;
-            }
-            else
-                (*x)++;
-        }
+        gtk_text_buffer_delete( m_buffer, &fromi, &toi );
     }
-    else // single line control
+    else // single line
     {
-        if ( pos <= GTK_ENTRY(m_text)->text_length )
-        {
-            *y = 0;
-            *x = pos;
-        }
-        else
-        {
-            // index out of bounds
-            return FALSE;
-        }
+        wxTextEntry::Remove(from, to);
     }
-
-    return TRUE;
 }
 
-long wxTextCtrl::XYToPosition(long x, long y ) const
+void wxTextCtrl::Cut()
 {
-    if (!(m_windowStyle & wxTE_MULTILINE)) return 0;
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
+
+    if ( IsMultiLine() )
+        g_signal_emit_by_name (m_text, "cut-clipboard");
+    else
+        wxTextEntry::Cut();
+}
 
-    long pos=0;
-    for( int i=0; i<y; i++ ) pos += GetLineLength(i) + 1; // one for '\n'
+void wxTextCtrl::Copy()
+{
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
-    pos += x; 
-    return pos;
+    if ( IsMultiLine() )
+        g_signal_emit_by_name (m_text, "copy-clipboard");
+    else
+        wxTextEntry::Copy();
 }
 
-int wxTextCtrl::GetLineLength(long lineNo) const
+void wxTextCtrl::Paste()
 {
-    wxString str = GetLineText (lineNo);
-    return (int) str.Length();
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
+
+    if ( IsMultiLine() )
+        g_signal_emit_by_name (m_text, "paste-clipboard");
+    else
+        wxTextEntry::Paste();
 }
 
-int wxTextCtrl::GetNumberOfLines() const
+// If the return values from and to are the same, there is no
+// selection.
+void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
 {
-    if (m_windowStyle & wxTE_MULTILINE)
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
+
+    if ( !IsMultiLine() )
     {
-        gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-        char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
+        wxTextEntry::GetSelection(fromOut, toOut);
+        return;
+    }
 
-        if (text)
-        {
-            int currentLine = 0;
-            for (int i = 0; i < len; i++ )
-            {
-                if (text[i] == '\n')
-                    currentLine++;
-            }
-            g_free( text );
+    gint from, to;
 
-            // currentLine is 0 based, add 1 to get number of lines
-            return currentLine + 1;
-        }
-        else
+    GtkTextIter ifrom, ito;
+    if ( gtk_text_buffer_get_selection_bounds(m_buffer, &ifrom, &ito) )
+    {
+        from = gtk_text_iter_get_offset(&ifrom);
+        to = gtk_text_iter_get_offset(&ito);
+
+        if ( from > to )
         {
-            return 0;
+            // exchange them to be compatible with wxMSW
+            gint tmp = from;
+            from = to;
+            to = tmp;
         }
     }
-    else
+    else // no selection
     {
-        return 1;
+        from =
+        to = GetInsertionPoint();
     }
+
+    if ( fromOut )
+        *fromOut = from;
+    if ( toOut )
+        *toOut = to;
 }
 
-void wxTextCtrl::SetInsertionPoint( long pos )
+
+bool wxTextCtrl::IsEditable() const
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
-    
-    if (m_windowStyle & wxTE_MULTILINE) 
-    {
-        /* seems to be broken in GTK 1.0.X:
-          gtk_text_set_point( GTK_TEXT(m_text), (int)pos ); */
-      
-        gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-      
-        /* we fake a set_point by inserting and deleting. as the user
-          isn't supposed to get to know about thos non-sense, we
-          disconnect so that no events are sent to the user program. */
-      
-        gint tmp = (gint)pos;
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), " ", 1, &tmp );
-       gtk_editable_delete_text( GTK_EDITABLE(m_text), tmp-1, tmp );
-       
-        gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-         
-       /* bring editable's cursor uptodate. another bug in GTK. */
-       
-       GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+    wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
+
+    if ( IsMultiLine() )
+    {
+        return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text)) != 0;
     }
     else
     {
-        gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
-       
-       /* bring editable's cursor uptodate. bug in GTK. */
-       
-       GTK_EDITABLE(m_text)->current_pos = pos;
+        return wxTextEntry::IsEditable();
     }
 }
 
-void wxTextCtrl::SetInsertionPointEnd()
+bool wxTextCtrl::IsModified() const
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
-
-    if (m_windowStyle & wxTE_MULTILINE)
-        SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text)));
-    else
-        gtk_entry_set_position( GTK_ENTRY(m_text), -1 );
+    return m_modified;
 }
 
-void wxTextCtrl::SetEditable( bool editable )
+void wxTextCtrl::OnChar( wxKeyEvent &key_event )
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
-    if (m_windowStyle & wxTE_MULTILINE)
-        gtk_text_set_editable( GTK_TEXT(m_text), editable );
-    else
-        gtk_entry_set_editable( GTK_ENTRY(m_text), editable );
-}
-
-void wxTextCtrl::SetSelection( long from, long to )
-{
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    if ( key_event.GetKeyCode() == WXK_RETURN )
+    {
+        if ( HasFlag(wxTE_PROCESS_ENTER) )
+        {
+            wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+            event.SetEventObject(this);
+            event.SetString(GetValue());
+            if ( HandleWindowEvent(event) )
+                return;
+        }
+    }
 
-    gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+    key_event.Skip();
 }
 
-void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
+GtkWidget* wxTextCtrl::GetConnectWidget()
 {
-    wxFAIL_MSG( "wxTextCtrl::ShowPosition not implemented" );
+    return GTK_WIDGET(m_text);
 }
 
-long wxTextCtrl::GetInsertionPoint() const
+GdkWindow *wxTextCtrl::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
-    wxCHECK_MSG( m_text != NULL, 0, "invalid text ctrl" );
-
-    return (long) GTK_EDITABLE(m_text)->current_pos;
+    if ( IsMultiLine() )
+    {
+        return gtk_text_view_get_window(GTK_TEXT_VIEW(m_text),
+                                        GTK_TEXT_WINDOW_TEXT );
+    }
+    else
+    {
+#ifdef __WXGTK3__
+        // no access to internal GdkWindows
+        return NULL;
+#else
+        return gtk_entry_get_text_window(GTK_ENTRY(m_text));
+#endif
+    }
 }
 
-long wxTextCtrl::GetLastPosition() const
+// the font will change for subsequent text insertiongs
+bool wxTextCtrl::SetFont( const wxFont &font )
 {
-    wxCHECK_MSG( m_text != NULL, 0, "invalid text ctrl" );
+    wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
 
-    int pos = 0;
-    if (m_windowStyle & wxTE_MULTILINE)
-        pos = gtk_text_get_length( GTK_TEXT(m_text) );
-    else
-        pos = GTK_ENTRY(m_text)->text_length;
+    if ( !wxTextCtrlBase::SetFont(font) )
+    {
+        // font didn't change, nothing to do
+        return false;
+    }
 
-    return (long)pos;
-}
+    if ( IsMultiLine() )
+    {
+        SetUpdateFont(true);
 
-void wxTextCtrl::Remove( long from, long to )
-{
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+        m_defaultStyle.SetFont(font);
+
+        ChangeFontGlobally();
+    }
 
-    gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+    return true;
 }
 
-void wxTextCtrl::Replace( long from, long to, const wxString &value )
+void wxTextCtrl::ChangeFontGlobally()
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    // this method is very inefficient and hence should be called as rarely as
+    // possible!
+    //
+    // TODO: it can be implemented much more efficiently for GTK2
+    wxASSERT_MSG( IsMultiLine(),
+                  wxT("shouldn't be called for single line controls") );
+
+    wxString value = GetValue();
+    if ( !value.empty() )
+    {
+        SetUpdateFont(false);
 
-    gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
-    if (value.IsNull()) return;
-    gint pos = (gint)from;
-    gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos );
+        Clear();
+        AppendText(value);
+    }
 }
 
-void wxTextCtrl::Cut()
+bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    if ( !wxControl::SetForegroundColour(colour) )
+        return false;
 
-#if (GTK_MINOR_VERSION > 0)
-    gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );
-#else
-    gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 );
-#endif
+    // update default fg colour too
+    m_defaultStyle.SetTextColour(colour);
+
+    return true;
 }
 
-void wxTextCtrl::Copy()
+bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
 
-#if (GTK_MINOR_VERSION > 0)
-    gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) );
-#else
-    gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 );
-#endif
-}
+    if ( !wxControl::SetBackgroundColour( colour ) )
+        return false;
 
-void wxTextCtrl::Paste()
-{
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    if (!m_backgroundColour.IsOk())
+        return false;
 
-#if (GTK_MINOR_VERSION > 0)
-    gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );
-#else
-    gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 );
-#endif
-}
+    // change active background color too
+    m_defaultStyle.SetBackgroundColour( colour );
 
-bool wxTextCtrl::CanCopy() const
-{
-    // Can copy if there's a selection
-    long from, to;
-    GetSelection(& from, & to);
-    return (from != to) ;
+    return true;
 }
 
-bool wxTextCtrl::CanCut() const
+bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
 {
-    // Can cut if there's a selection
-    long from, to;
-    GetSelection(& from, & to);
-    return (from != to) ;
-}
+    if ( IsMultiLine() )
+    {
+        if ( style.IsDefault() )
+        {
+            // nothing to do
+            return true;
+        }
 
-bool wxTextCtrl::CanPaste() const
-{
-    return IsEditable() ;
-}
+        gint l = gtk_text_buffer_get_char_count( m_buffer );
 
-// Undo/redo
-void wxTextCtrl::Undo()
-{
-    // TODO
-    wxFAIL_MSG( "wxTextCtrl::Undo not implemented" );
-}
+        wxCHECK_MSG( start >= 0 && end <= l, false,
+                     wxT("invalid range in wxTextCtrl::SetStyle") );
 
-void wxTextCtrl::Redo()
-{
-    // TODO
-    wxFAIL_MSG( "wxTextCtrl::Redo not implemented" );
-}
+        GtkTextIter starti, endi;
+        gtk_text_buffer_get_iter_at_offset( m_buffer, &starti, start );
+        gtk_text_buffer_get_iter_at_offset( m_buffer, &endi, end );
 
-bool wxTextCtrl::CanUndo() const
-{
-    // TODO
-    wxFAIL_MSG( "wxTextCtrl::CanUndo not implemented" );
-    return FALSE;
-}
+        wxGtkTextApplyTagsFromAttr( m_widget, m_buffer, style, &starti, &endi );
 
-bool wxTextCtrl::CanRedo() const
-{
-    // TODO
-    wxFAIL_MSG( "wxTextCtrl::CanRedo not implemented" );
-    return FALSE;
-}
+        return true;
+    }
+    //else: single line text controls don't support styles
 
-// If the return values from and to are the same, there is no
-// selection.
-void wxTextCtrl::GetSelection(long* from, long* to) const
-{
-    // TODO
-    *from = 0;
-    *to = 0;
-    wxFAIL_MSG( "wxTextCtrl::GetSelection not implemented" );
+    return false;
 }
 
-bool wxTextCtrl::IsEditable() const
+bool wxTextCtrl::GetStyle(long position, wxTextAttr& style)
 {
-    // TODO
-    wxFAIL_MSG( "wxTextCtrl::IsEditable not implemented" );
-    return FALSE;
-}
+    if ( !IsMultiLine() )
+    {
+        // no styles for GtkEntry
+        return false;
+    }
 
-void wxTextCtrl::Clear()
-{
-    SetValue( "" );
-}
+    gint l = gtk_text_buffer_get_char_count( m_buffer );
 
-void wxTextCtrl::OnChar( wxKeyEvent &key_event )
-{
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_MSG( position >= 0 && position <= l, false,
+                 wxT("invalid range in wxTextCtrl::GetStyle") );
 
-    if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
+    GtkTextIter positioni;
+    gtk_text_buffer_get_iter_at_offset(m_buffer, &positioni, position);
+
+    // Obtain a copy of the default attributes
+    GtkTextAttributes * const
+        pattr = gtk_text_view_get_default_attributes(GTK_TEXT_VIEW(m_text));
+    wxON_BLOCK_EXIT1(gtk_text_attributes_unref, pattr);
+
+    // And query GTK for the attributes at the given position using it as base
+    if ( !gtk_text_iter_get_attributes(&positioni, pattr) )
     {
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
-        event.SetEventObject(this);
-        if (GetEventHandler()->ProcessEvent(event)) return;
+        style = m_defaultStyle;
     }
+    else // have custom attributes
+    {
+        style.SetBackgroundColour(pattr->appearance.bg_color);
+        style.SetTextColour(pattr->appearance.fg_color);
 
-    key_event.Skip();
+        const wxGtkString
+            pangoFontString(pango_font_description_to_string(pattr->font));
+
+        wxFont font;
+        if ( font.SetNativeFontInfo(wxString(pangoFontString)) )
+            style.SetFont(font);
+
+        // TODO: set alignment, tabs and indents
+    }
+
+    return true;
 }
 
-#ifndef NO_TEXT_WINDOW_STREAM
-int wxTextCtrl::overflow( int WXUNUSED(c) )
+void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    int len = pptr() - pbase();
-    char *txt = new char[len+1];
-    strncpy(txt, pbase(), len);
-    txt[len] = '\0';
-    (*this) << txt;
-    setp(pbase(), epptr());
-    delete[] txt;
-    return EOF;
+    GTKApplyStyle(m_text, style);
 }
 
-int wxTextCtrl::sync()
+void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))
 {
-    int len = pptr() - pbase();
-    char *txt = new char[len+1];
-    strncpy(txt, pbase(), len);
-    txt[len] = '\0';
-    (*this) << txt;
-    setp(pbase(), epptr());
-    delete[] txt;
-    return 0;
+    Cut();
 }
 
-int wxTextCtrl::underflow()
+void wxTextCtrl::OnCopy(wxCommandEvent& WXUNUSED(event))
 {
-    return EOF;
+    Copy();
 }
 
-wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
+void wxTextCtrl::OnPaste(wxCommandEvent& WXUNUSED(event))
 {
-    AppendText(s);
-    return *this;
+    Paste();
 }
 
-wxTextCtrl& wxTextCtrl::operator<<(float f)
+void wxTextCtrl::OnUndo(wxCommandEvent& WXUNUSED(event))
 {
-    static char buf[100];
-    sprintf(buf, "%.2f", f);
-    AppendText(buf);
-    return *this;
+    Undo();
 }
 
-wxTextCtrl& wxTextCtrl::operator<<(double d)
+void wxTextCtrl::OnRedo(wxCommandEvent& WXUNUSED(event))
 {
-    static char buf[100];
-    sprintf(buf, "%.2f", d);
-    AppendText(buf);
-    return *this;
+    Redo();
 }
 
-wxTextCtrl& wxTextCtrl::operator<<(int i)
+void wxTextCtrl::OnUpdateCut(wxUpdateUIEvent& event)
 {
-    static char buf[100];
-    sprintf(buf, "%i", i);
-    AppendText(buf);
-    return *this;
+    event.Enable( CanCut() );
 }
 
-wxTextCtrl& wxTextCtrl::operator<<(long i)
+void wxTextCtrl::OnUpdateCopy(wxUpdateUIEvent& event)
 {
-    static char buf[100];
-    sprintf(buf, "%ld", i);
-    AppendText(buf);
-    return *this;
+    event.Enable( CanCopy() );
 }
 
-wxTextCtrl& wxTextCtrl::operator<<(const char c)
+void wxTextCtrl::OnUpdatePaste(wxUpdateUIEvent& event)
 {
-    char buf[2];
+    event.Enable( CanPaste() );
+}
 
-    buf[0] = c;
-    buf[1] = 0;
-    AppendText(buf);
-    return *this;
+void wxTextCtrl::OnUpdateUndo(wxUpdateUIEvent& event)
+{
+    event.Enable( CanUndo() );
 }
-#endif
 
-GtkWidget* wxTextCtrl::GetConnectWidget()
+void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
 {
-    return GTK_WIDGET(m_text);
+    event.Enable( CanRedo() );
 }
 
-bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
+wxSize wxTextCtrl::DoGetBestSize() const
 {
-    if (m_windowStyle & wxTE_MULTILINE)
-        return (window == GTK_TEXT(m_text)->text_area);
-    else
-        return (window == GTK_ENTRY(m_text)->text_area);
+    // FIXME should be different for multi-line controls...
+    wxSize ret( wxControl::DoGetBestSize() );
+    wxSize best(80, ret.y);
+    CacheBestSize(best);
+    return best;
 }
 
-void wxTextCtrl::SetFont( const wxFont &WXUNUSED(font) )
+// ----------------------------------------------------------------------------
+// freeze/thaw
+// ----------------------------------------------------------------------------
+
+void wxTextCtrl::DoFreeze()
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET(m_text != NULL, wxT("invalid text ctrl"));
+
+    wxWindow::DoFreeze();
 
-    // doesn't work
+    if ( HasFlag(wxTE_MULTILINE) )
+    {
+        GTKFreezeWidget(m_text);
+
+        // removing buffer dramatically speeds up insertion:
+        g_object_ref(m_buffer);
+        GtkTextBuffer* buf_new = gtk_text_buffer_new(NULL);
+        gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), buf_new);
+        // gtk_text_view_set_buffer adds its own reference
+        g_object_unref(buf_new);
+        // These marks should be deleted when the buffer is changed,
+        // but they are not (in GTK+ up to at least 3.0.1).
+        // Otherwise these anonymous marks start to build up in the buffer,
+        // and Freeze takes longer and longer each time it is called.
+        if (m_anonymousMarkList)
+        {
+            for (GSList* item = m_anonymousMarkList; item; item = item->next)
+            {
+                GtkTextMark* mark = static_cast<GtkTextMark*>(item->data);
+                if (GTK_IS_TEXT_MARK(mark) && !gtk_text_mark_get_deleted(mark))
+                    gtk_text_buffer_delete_mark(m_buffer, mark);
+            }
+            g_slist_free(m_anonymousMarkList);
+            m_anonymousMarkList = NULL;
+        }
+    }
 }
 
-void wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) )
+void wxTextCtrl::DoThaw()
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    if ( HasFlag(wxTE_MULTILINE) )
+    {
+        // reattach buffer:
+        gulong sig_id = g_signal_connect(m_buffer, "mark_set", G_CALLBACK(mark_set), &m_anonymousMarkList);
+        gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), m_buffer);
+        g_object_unref(m_buffer);
+        g_signal_handler_disconnect(m_buffer, sig_id);
+
+        if (m_showPositionOnThaw != NULL)
+        {
+            gtk_text_view_scroll_mark_onscreen(
+                GTK_TEXT_VIEW(m_text), m_showPositionOnThaw);
+            m_showPositionOnThaw = NULL;
+        }
+
+        // and thaw the window
+        GTKThawWidget(m_text);
+    }
 
-    // doesn't work
+    wxWindow::DoThaw();
 }
 
-void wxTextCtrl::SetBackgroundColour( const wxColour &colour )
+// ----------------------------------------------------------------------------
+// wxTextUrlEvent passing if style & wxTE_AUTO_URL
+// ----------------------------------------------------------------------------
+
+// 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)
 {
-    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    event.Skip();
+    if( !HasFlag(wxTE_AUTO_URL) )
+        return;
 
-    wxControl::SetBackgroundColour( colour );
+    gint x, y;
+    GtkTextIter start, end;
+    GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(m_buffer),
+                                                "wxUrl");
 
-    wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
-    if (sysbg.Red() == colour.Red() &&
-        sysbg.Green() == colour.Green() &&
-        sysbg.Blue() == colour.Blue())
+    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))
     {
+        SetCursor(wxCursor(wxCURSOR_IBEAM));
         return;
     }
 
-    if (!m_backgroundColour.Ok()) return;
+    SetCursor(wxCursor(wxCURSOR_HAND));
 
-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-        GdkWindow *window = GTK_TEXT(m_text)->text_area;
-        m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
-        gdk_window_set_background( window, m_backgroundColour.GetColor() );
-        gdk_window_clear( window );
-    }
+    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 dependent 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(!HandleWindowEvent(url_event));
+    HandleWindowEvent(url_event);
 }
 
-void wxTextCtrl::ApplyWidgetStyle()
+bool wxTextCtrl::GTKProcessEvent(wxEvent& event) const
 {
-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-        // how ?
-    }
-    else
-    {
-        SetWidgetStyle();
-        gtk_widget_set_style( m_text, m_widgetStyle );
-    }
+    bool rc = wxTextCtrlBase::GTKProcessEvent(event);
+
+    // GtkTextView starts a drag operation when left mouse button is pressed
+    // and ends it when it is released and if it doesn't get the release event
+    // the next click on a control results in an assertion failure inside
+    // gtk_text_view_start_selection_drag() which simply *kills* the program
+    // without anything we can do about it, so always let GTK+ have this event
+    return rc && (IsSingleLine() || event.GetEventType() != wxEVT_LEFT_UP);
+}
+
+// static
+wxVisualAttributes
+wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true);
 }
 
+#endif // wxUSE_TEXTCTRL