]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/textctrl.cpp
rebaked after adding new string-related headers
[wxWidgets.git] / src / gtk / textctrl.cpp
index 76dae328f500f3260865e15a0d64ee55ec427e08..4fc49796fb41df88ab1dc1899c154ba9b7f67770 100644 (file)
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        textctrl.cpp
+// Name:        src/gtk/textctrl.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "textctrl.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #include "wx/textctrl.h"
 
 #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/strconv.h"
+#include "wx/fontutil.h"        // for wxNativeFontInfo (GetNativeFontInfo())
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkkeysyms.h"
+#include "wx/gtk/private.h"
+
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------
+
+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);
+}
+}
+
+static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
+                                       GtkTextBuffer *text_buffer,
+                                       const wxTextAttr& attr,
+                                       GtkTextIter *start,
+                                       GtkTextIter *end)
+{
+    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())
+    {
+        PangoFontDescription *font_description = attr.GetFont().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 (attr.GetFont().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 (attr.HasTextColour())
+    {
+        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())
+    {
+        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);
+
+        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 );
+    }
+
+    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);
+
+        remove_handler_id = g_signal_connect (text_buffer, "remove_tag",
+                                              G_CALLBACK(wxGtkOnRemoveTag),
+                                              gpointer("WXINDENT"));
+        gtk_text_buffer_remove_all_tags( text_buffer, &para_start, &para_end );
+        g_signal_handler_disconnect (text_buffer, remove_handler_id);
+
+        // Convert indent from 1/10th of a mm into pixels
+        float factor;
+#if GTK_CHECK_VERSION(2,2,0)
+        if (!gtk_check_version(2,2,0))
+            factor = (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
+                      gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;
+        else
+#endif
+            factor = (float)gdk_screen_width() / gdk_screen_width_mm() / 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);
+
+        remove_handler_id = g_signal_connect (text_buffer, "remove_tag",
+                                              G_CALLBACK(wxGtkOnRemoveTag),
+                                              gpointer("WXTABS"));
+        gtk_text_buffer_remove_all_tags( text_buffer, &para_start, &para_end );
+        g_signal_handler_disconnect (text_buffer, remove_handler_id);
+
+        const wxArrayInt& tabs = attr.GetTabs();
+
+        wxString tagname = _T("WXTABS");
+        g_snprintf(buf, sizeof(buf), "WXTABS");
+        for (size_t i = 0; i < tabs.GetCount(); i++)
+            tagname += wxString::Format(_T(" %d"), tabs[i]);
+
+        const wxWX2MBbuf buf = tagname.mb_str(wxConvUTF8);
+
+        tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
+                                        buf );
+        if (!tag)
+        {
+            // Factor to convert from 1/10th of a mm into pixels
+            float factor;
+#if GTK_CHECK_VERSION(2,2,0)
+            if (!gtk_check_version(2,2,0))
+                factor = (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
+                          gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;
+            else
+#endif
+                factor = (float)gdk_screen_width() / gdk_screen_width_mm() / 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, buf,
+                                              "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);
+}
+
+// ----------------------------------------------------------------------------
+// "insert_text" for GtkEntry
+// ----------------------------------------------------------------------------
+
+extern "C" {
+static void
+gtk_insert_text_callback(GtkEditable *editable,
+                         const gchar *new_text,
+                         gint new_text_length,
+                         gint *position,
+                         wxTextCtrl *win)
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    // we should only be called if we have a max len limit at all
+    GtkEntry *entry = GTK_ENTRY (editable);
+
+    wxCHECK_RET( entry->text_max_length, _T("shouldn't be called") );
+
+    // check that we don't overflow the max length limit
+    //
+    // FIXME: this doesn't work when we paste a string which is going to be
+    //        truncated
+    if ( entry->text_length == entry->text_max_length )
+    {
+        // we don't need to run the base class version at all
+        g_signal_stop_emission_by_name (editable, "insert_text");
+
+        // remember that the next changed signal is to be ignored to avoid
+        // generating a dummy wxEVT_COMMAND_TEXT_UPDATED event
+        win->IgnoreNextTextUpdate();
+
+        // and generate the correct one ourselves
+        wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, win->GetId());
+        event.SetEventObject(win);
+        event.SetString(win->GetValue());
+        win->GetEventHandler()->ProcessEvent( event );
+    }
+}
+}
+
+// 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");
+}
+}
 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-// idle system
+//  GtkTextCharPredicates for gtk_text_iter_*_find_char
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+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 == '/';
+}
+}
 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-// data
+//  Check for links between s and e and correct tags as necessary
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 
-extern bool   g_blockEventsOnDrag;
+// 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);
+}
+}
+
 
 //-----------------------------------------------------------------------------
 //  "changed"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 //  "changed"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void
 static void
-gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
+gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
 {
 {
+    if ( win->IgnoreTextUpdate() )
+        return;
+
     if (!win->m_hasVMT) return;
 
     if (g_isIdle)
         wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return;
 
     if (g_isIdle)
         wxapp_install_idle_handler();
 
-    win->SetModified();
+    if ( win->MarkDirtyOnChange() )
+        win->MarkDirty();
 
 
-    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
-    event.SetString( win->GetValue() );
-    event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
+    win->SendTextUpdatedEvent();
+}
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------
-// "changed" from vertical scrollbar
+//  clipboard events: "copy-clipboard", "cut-clipboard", "paste-clipboard"
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 
+// common part of the event handlers below
 static void
 static void
-gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
+handle_text_clipboard_callback( GtkWidget *widget, wxTextCtrl *win,
+                                wxEventType eventType, const gchar * signal_name)
 {
 {
-    if (!win->m_hasVMT) return;
+    wxClipboardTextEvent event( eventType, win->GetId() );
+    event.SetEventObject( win );
+    if ( win->GetEventHandler()->ProcessEvent( 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);
+    }
+}
 
 
-    if (g_isIdle)
-        wxapp_install_idle_handler();
+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_cut_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
+{
+    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" );
+}
+}
+
+//-----------------------------------------------------------------------------
+// "expose_event" from scrolled window and textview
+//-----------------------------------------------------------------------------
 
 
-    win->CalculateScrollbar();
+extern "C" {
+static gboolean
+gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win )
+{
+    return TRUE;
+}
 }
 
 }
 
+
 //-----------------------------------------------------------------------------
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
 
 
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
 
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
     EVT_CHAR(wxTextCtrl::OnChar)
 
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
@@ -92,579 +625,614 @@ 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)
     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()
 
 END_EVENT_TABLE()
 
-#if wxUSE_STD_IOSTREAM
-wxTextCtrl::wxTextCtrl() : streambuf()
+void wxTextCtrl::Init()
 {
 {
-    if (allocate()) setp(base(),ebuf());
+    m_dontMarkDirty =
+    m_modified = false;
 
 
-    m_modified = FALSE;
+    m_countUpdatesToIgnore = 0;
+
+    SetUpdateFont(false);
+
+    m_text = NULL;
+    m_freezeCount = 0;
+    m_showPositionOnThaw = NULL;
+    m_gdkHandCursor = NULL;
+    m_gdkXTermCursor = NULL;
 }
 }
-#else
-wxTextCtrl::wxTextCtrl()
+
+wxTextCtrl::~wxTextCtrl()
 {
 {
-    m_modified = FALSE;
+    if(m_gdkHandCursor)
+        gdk_cursor_unref(m_gdkHandCursor);
+    if(m_gdkXTermCursor)
+        gdk_cursor_unref(m_gdkXTermCursor);
 }
 }
-#endif
 
 
-#if wxUSE_STD_IOSTREAM
-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 );
 }
     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;
-
-    PreCreation( parent, id, pos, size, style, name );
-
-#if wxUSE_VALIDATORS
-    SetValidator( validator );
-#endif // wxUSE_VALIDATORS
+    m_needParent = true;
 
 
-    m_vScrollbarVisible = FALSE;
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxTextCtrl creation failed") );
+        return false;
+    }
 
     bool multi_line = (style & wxTE_MULTILINE) != 0;
 
     bool multi_line = (style & wxTE_MULTILINE) != 0;
+
     if (multi_line)
     {
     if (multi_line)
     {
-#if (GTK_MINOR_VERSION > 2)
-        /* a multi-line edit control: create a vertical scrollbar by default and
-           horizontal if requested */
-        bool bHasHScrollbar = (style & wxHSCROLL) != 0;
-#else
-        bool bHasHScrollbar = FALSE;
-#endif
+        // Create view
+        m_text = gtk_text_view_new();
 
 
-        /* create our control ... */
-        m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
+        m_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
 
 
-        /* ... 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);
+        // create "ShowPosition" marker
+        GtkTextIter iter;
+        gtk_text_buffer_get_start_iter(m_buffer, &iter);
+        gtk_text_buffer_create_mark(m_buffer, "ShowPosition", &iter, true);
 
 
-        /* always wrap words */
-        gtk_text_set_word_wrap( GTK_TEXT(m_text), 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] = (GtkRange*)((GtkScrolledWindow*)m_widget)->vscrollbar;
 
 
-#if (GTK_MINOR_VERSION > 2)
-        /* 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_SHRINK),
-                       GTK_FILL,
-                       0, 0);
-            gtk_widget_show(hscrollbar);
-
-            /* don't wrap lines, otherwise we wouldn't need the scrollbar */
-            gtk_text_set_line_wrap( GTK_TEXT(m_text), FALSE );
-        }
-#endif
+        // Insert view into scrolled window
+        gtk_container_add( GTK_CONTAINER(m_widget), m_text );
+
+        GTKSetWrapMode();
+
+        GtkScrolledWindowSetBorder(m_widget, style);
 
 
-        /* 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_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
     {
-        /* a single-line text control: no need for scrollbars */
+        // a single-line text control: no need for scrollbars
         m_widget =
         m_widget =
-          m_text = gtk_entry_new();
-    }
+        m_text = gtk_entry_new();
 
 
-    wxSize newSize = size;
-    if (newSize.x == -1) newSize.x = 80;
-    if (newSize.y == -1) newSize.y = 26;
-    SetSize( newSize.x, newSize.y );
+        if (style & wxNO_BORDER)
+            g_object_set (m_text, "has-frame", FALSE, NULL);
+    }
 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 
-    PostCreation();
-
-    if (multi_line)
-        gtk_widget_show(m_text);
+    m_focusWidget = m_text;
 
 
-    /* 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);
+    PostCreation(size);
 
     if (multi_line)
     {
 
     if (multi_line)
     {
-        gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed",
-          (GtkSignalFunc) gtk_scrollbar_changed_callback, (gpointer) this );
+        gtk_widget_show(m_text);
     }
 
     }
 
-    if (!value.IsEmpty())
+    if (!value.empty())
     {
     {
-        gint tmp = 0;
-
-#if GTK_MINOR_VERSION == 0
-        // if we don't realize it, GTK 1.0.6 dies with a SIGSEGV in
-        // gtk_editable_insert_text()
-        gtk_widget_realize(m_text);
-#endif // GTK 1.0
-
-#if wxUSE_UNICODE
-        wxWX2MBbuf val = value.mbc_str();
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), val, strlen(val), &tmp );
-#else // !Unicode
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
-#endif // Unicode/!Unicode
-
-        if (multi_line)
-        {
-            /* bring editable's cursor uptodate. bug in GTK. */
-
-            GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
-        }
+        SetValue( value );
     }
 
     if (style & wxTE_PASSWORD)
     }
 
     if (style & wxTE_PASSWORD)
-    {
-        if (!multi_line)
-            gtk_entry_set_visibility( GTK_ENTRY(m_text), FALSE );
-    }
+        GTKSetVisibility();
 
     if (style & wxTE_READONLY)
 
     if (style & wxTE_READONLY)
+        GTKSetEditable();
+
+    // left justification (alignment) is the default anyhow
+    if ( style & (wxTE_RIGHT | wxTE_CENTRE) )
+        GTKSetJustification();
+
+    // We want to be notified about text changes.
+    if (multi_line)
     {
     {
-        if (!multi_line)
-            gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
+        g_signal_connect (m_buffer, "changed",
+                          G_CALLBACK (gtk_text_changed_callback), 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 (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
     {
     }
     else
     {
-        if (multi_line)
-            gtk_text_set_editable( GTK_TEXT(m_text), 1 );
+        g_signal_connect (m_text, "changed",
+                          G_CALLBACK (gtk_text_changed_callback), this);
     }
 
     }
 
-    SetBackgroundColour( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) );
-    SetForegroundColour( parent->GetForegroundColour() );
+    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);
 
 
-    Show( TRUE );
+    m_cursor = wxCursor( wxCURSOR_IBEAM );
 
 
-    return TRUE;
+    wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont());
+    SetDefaultStyle( attrDef );
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// 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::CalculateScrollbar()
+void wxTextCtrl::GTKSetVisibility()
 {
 {
-    if ((m_windowStyle & wxTE_MULTILINE) == 0) return;
+    // VZ: shouldn't we assert if wxTE_PASSWORD is set for multiline control?
+    if ( IsSingleLine() )
+        gtk_entry_set_visibility(GTK_ENTRY(m_text), !HasFlag(wxTE_PASSWORD));
+}
 
 
-    GtkAdjustment *adj = GTK_TEXT(m_text)->vadj;
+void wxTextCtrl::GTKSetWrapMode()
+{
+    // no wrapping in single line controls
+    if ( !IsMultiLine() )
+        return;
 
 
-    if (adj->upper - adj->page_size < 0.8)
+    // 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
     {
     {
-        if (m_vScrollbarVisible)
+        // GTK_WRAP_WORD_CHAR seems to be new in GTK+ 2.4
+#ifdef __WXGTK24__
+        if ( !gtk_check_version(2,4,0) )
         {
         {
-            gtk_widget_hide( m_vScrollbar );
-            m_vScrollbarVisible = FALSE;
+            wrap = GTK_WRAP_WORD_CHAR;
         }
         }
+        else
+#endif // __WXGTK24__
+        wrap = GTK_WRAP_WORD;
     }
     }
-    else
+
+    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
     {
     {
-        if (!m_vScrollbarVisible)
+#ifdef __WXGTK24__
+        // gtk_entry_set_alignment was introduced in gtk+-2.3.5
+        if (!gtk_check_version(2,4,0))
         {
         {
-            gtk_widget_show( m_vScrollbar );
-            m_vScrollbarVisible = TRUE;
+            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);
         }
         }
+#endif // __WXGTK24__
     }
     }
+
+}
+
+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();
+
+    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
 {
 wxString wxTextCtrl::GetValue() const
 {
-    wxCHECK_MSG( m_text != NULL, _T(""), _T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );
 
     wxString tmp;
 
     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 = wxString(text,*wxConvCurrent);
-        g_free( text );
+        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));
+
+        const wxWxCharBuffer buf = wxGTK_CONV_BACK(text);
+        if ( buf )
+            tmp = buf;
     }
     else
     {
     }
     else
     {
-        tmp = wxString(gtk_entry_get_text( GTK_ENTRY(m_text) ),*wxConvCurrent);
+        const gchar *text = gtk_entry_get_text( GTK_ENTRY(m_text) );
+        const wxWxCharBuffer buf = wxGTK_CONV_BACK( text );
+        if ( buf )
+            tmp = buf;
     }
     }
+
     return tmp;
 }
 
     return tmp;
 }
 
-void wxTextCtrl::SetValue( const wxString &value )
+wxFontEncoding wxTextCtrl::GetTextEncoding() const
 {
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    // GTK+ uses UTF-8 internally, we need to convert to it but from which
+    // encoding?
 
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+    // 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.HasFont() ? style.GetFont().GetEncoding()
+                                         : wxFONTENCODING_SYSTEM;
 
 
-    wxString tmp = _T("");
-    if (!value.IsNull()) tmp = value;
-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-        gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-        gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len );
-        len = 0;
-#if wxUSE_UNICODE
-        wxWX2MBbuf tmpbuf = tmp.mbc_str();
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), tmpbuf, strlen(tmpbuf), &len );
-#else
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), tmp.mbc_str(), tmp.Length(), &len );
-#endif
-    }
-    else
-    {
-        gtk_entry_set_text( GTK_ENTRY(m_text), tmp.mbc_str() );
-    }
+    // fall back to the controls font if no style
+    if ( enc == wxFONTENCODING_SYSTEM && m_hasFont )
+        enc = GetFont().GetEncoding();
 
 
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+    return enc;
 }
 
 }
 
-void wxTextCtrl::WriteText( const wxString &text )
+bool wxTextCtrl::IsEmpty() const
 {
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    if ( IsMultiLine() )
+        return gtk_text_buffer_get_char_count(m_buffer) == 0;
 
 
-    if (text.IsEmpty()) return;
+    return wxTextCtrlBase::IsEmpty();
+}
 
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+void wxTextCtrl::DoSetValue( const wxString &value, int flags )
+{
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 
-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-        /* this moves the cursor pos to behind the inserted text */
-        gint len = GTK_EDITABLE(m_text)->current_pos;
+    // the control won't be modified any more as we programmatically replace
+    // all the existing text, so reset the flag and don't set it again (and do
+    // it now, before the text event handler is ran so that IsModified() called
+    // from there returns the expected value)
+    m_modified = false;
+    DontMarkDirtyOnNextChange();
 
 
-#if wxUSE_UNICODE
-        wxWX2MBbuf buf = text.mbc_str();
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len );
-#else
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
-#endif
+    wxFontEncoding enc = m_defaultStyle.HasFont()
+                            ? m_defaultStyle.GetFont().GetEncoding()
+                            : wxFONTENCODING_SYSTEM;
+    if ( enc == wxFONTENCODING_SYSTEM )
+        enc = GetTextEncoding();
 
 
-        /* bring editable's cursor uptodate. bug in GTK. */
-        GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
-    }
-    else
+    const wxCharBuffer buffer(wxGTK_CONV_ENC(value, enc));
+    if ( !buffer )
     {
     {
-        /* this moves the cursor pos to behind the inserted text */
-        gint len = GTK_EDITABLE(m_text)->current_pos;
-#if wxUSE_UNICODE
-        wxWX2MBbuf buf = text.mbc_str();
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len );
-#else
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
-#endif
-
-        /* 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 );
+        // see comment in WriteText() as to why we must warn the user about
+        // this
+        wxLogWarning(_("Failed to set text in the text control."));
+        return;
     }
 
     }
 
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-}
-
-void wxTextCtrl::AppendText( const wxString &text )
-{
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
-
-    if (text.IsEmpty()) return;
+    // if the control is not empty, two "changed" signals are emitted,
+    // otherwise only one and we need to ignore either both or one of them
+    int ignore = flags & SetValue_SendEvent ? 0 : 1;
+    if ( !IsEmpty() )
+        ignore++;
 
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+    if ( ignore )
+        IgnoreNextTextUpdate(ignore);
 
 
-    if (m_windowStyle & wxTE_MULTILINE)
+    if ( IsMultiLine() )
     {
     {
-        bool hasSpecialAttributes = m_font.Ok() ||
-                                    m_foregroundColour.Ok() ||
-                                    m_backgroundColour.Ok();
-        if ( hasSpecialAttributes )
-        {
-             gtk_text_insert( GTK_TEXT(m_text),
-                              m_font.GetInternalFont(),
-                              m_foregroundColour.GetColor(),
-                              m_backgroundColour.GetColor(),
-                              text, text.length());
+        gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
 
 
-        }
-        else
+        if ( !m_defaultStyle.IsDefault() )
         {
         {
-            /* we'll insert at the last position */
-            gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-#if wxUSE_UNICODE
-            wxWX2MBbuf buf = text.mbc_str();
-            gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len );
-#else
-            gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
-#endif
+            GtkTextIter start, end;
+            gtk_text_buffer_get_bounds( m_buffer, &start, &end );
+            wxGtkTextApplyTagsFromAttr(m_widget, m_buffer, m_defaultStyle,
+                                       &start, &end);
         }
         }
-
-        /* bring editable's cursor uptodate. bug in GTK. */
-        GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
     }
     }
-    else
+    else // single line
     {
     {
-        gtk_entry_append_text( GTK_ENTRY(m_text), text.mbc_str() );
+        gtk_entry_set_text( GTK_ENTRY(m_text), buffer );
     }
 
     }
 
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-}
+    // if, for whatever reason, the callback wasn't called the expected number
+    // of times, still reset the flags to the default values
+    m_dontMarkDirty = false;
+    m_countUpdatesToIgnore = 0;
 
 
-bool wxTextCtrl::LoadFile( const wxString &file )
-{
-    wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") );
 
 
-    if (!wxFileExists(file)) return FALSE;
+    // GRG, Jun/2000: Changed this after a lot of discussion in
+    //   the lists. wxWidgets 2.2 will have a set of flags to
+    //   customize this behaviour.
+    SetInsertionPoint(0);
+}
 
 
-    Clear();
+void wxTextCtrl::WriteText( const wxString &text )
+{
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 
-    FILE *fp = (FILE*) NULL;
-    struct stat statb;
+    if ( text.empty() )
+        return;
 
 
-    if ((stat (FNSTRINGCAST file.fn_str(), &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||
-        !(fp = fopen (FNSTRINGCAST file.fn_str(), "r")))
+    // check if we have a specific style for the current position
+    wxFontEncoding enc = wxFONTENCODING_SYSTEM;
+    wxTextAttr style;
+    if ( GetStyle(GetInsertionPoint(), style) && style.HasFont() )
     {
     {
-        return FALSE;
+        enc = style.GetFont().GetEncoding();
     }
     }
-    else
-    {
-        gint len = statb.st_size;
-        char *text;
-        if (!(text = (char*)malloc ((unsigned) (len + 1))))
-        {
-            fclose (fp);
-            return FALSE;
-        }
-        if (fread (text, sizeof (char), len, fp) != (size_t) len)
-        {
-        }
-        fclose (fp);
-
-        text[len] = 0;
-
-        gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-
-        if (m_windowStyle & wxTE_MULTILINE)
-        {
-            gint pos = 0;
-            gtk_editable_insert_text( GTK_EDITABLE(m_text), text, len, &pos );
-        }
-        else
-        {
-            gtk_entry_set_text( GTK_ENTRY(m_text), text );
-        }
 
 
-        gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+    if ( enc == wxFONTENCODING_SYSTEM )
+        enc = GetTextEncoding();
 
 
-        free (text);
-        m_modified = FALSE;
-        return TRUE;
+    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;
     }
     }
-    return FALSE;
-}
-
-bool wxTextCtrl::SaveFile( const wxString &file )
-{
-    wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") );
-
-    if (file == _T("")) return FALSE;
 
 
-    FILE *fp;
+    // we're changing the text programmatically
+    DontMarkDirtyOnNextChange();
 
 
-    if (!(fp = fopen (FNSTRINGCAST file.fn_str(), "w")))
+    if ( IsMultiLine() )
     {
     {
-        return FALSE;
+        // 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 );
+
+        GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(m_widget) );
+        // 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() && wxIsSameDouble(adj->value, adj->upper - adj->page_size))
+        {
+            gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text),
+                    gtk_text_buffer_get_insert( m_buffer ), 0.0, FALSE, 0.0, 1.0 );
+        }
     }
     }
-    else
+    else // single line
     {
     {
-      char *text = (char*) NULL;
-      gint len = 0;
-
-      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) );
-      }
-
-      if (fwrite (text, sizeof (char), len, fp) != (size_t) len)
-      {
-          // Did not write whole file
-      }
+        // First remove the selection if there is one
+        gtk_editable_delete_selection( GTK_EDITABLE(m_text) );
 
 
-      // Make sure newline terminates the file
-      if (text[len - 1] != '\n')
-          fputc ('\n', fp);
+        // This moves the cursor pos to behind the inserted text.
+        gint len = gtk_editable_get_position(GTK_EDITABLE(m_text));
 
 
-      fclose (fp);
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
 
 
-      if (m_windowStyle & wxTE_MULTILINE) g_free( text );
-
-      m_modified = FALSE;
-      return TRUE;
+        // Bring entry's cursor uptodate.
+        gtk_editable_set_position( GTK_EDITABLE(m_text), len );
     }
     }
+}
 
 
-    return TRUE;
+void wxTextCtrl::AppendText( const wxString &text )
+{
+    SetInsertionPointEnd();
+    WriteText( text );
 }
 
 wxString wxTextCtrl::GetLineText( long lineNo ) const
 {
 }
 
 wxString wxTextCtrl::GetLineText( long lineNo ) 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 );
-
-    if (text)
+    wxString result;
+    if ( IsMultiLine() )
     {
     {
-        wxString buf(_T(""));
-        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];
-
-        g_free( text );
-        return buf;
+        GtkTextIter line;
+        gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo);
+        GtkTextIter end = 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
     }
     else
-      return wxEmptyString;
-  }
-  else
-  {
-    if (lineNo == 0) return GetValue();
-    return wxEmptyString;
-  }
+    {
+        if (lineNo == 0)
+            result = GetValue();
+    }
+    return result;
 }
 
 void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
 {
   /* If you implement this, don't forget to update the documentation!
    * (file docs/latex/wx/text.tex) */
 }
 
 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( _T("wxTextCtrl::OnDropFiles not implemented") );
+    wxFAIL_MSG( wxT("wxTextCtrl::OnDropFiles not implemented") );
 }
 
 }
 
-long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
+bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
 {
 {
-    if ( m_windowStyle & wxTE_MULTILINE )
+    if ( IsMultiLine() )
     {
     {
-        wxString text = GetValue();
+        GtkTextIter iter;
 
 
-        // cast to prevent warning. But pos really should've been unsigned.
-        if( (unsigned long)pos > text.Len()  )
-            return FALSE;
+        if (pos > GetLastPosition())
+            return false;
 
 
-        *x=0;   // First Col
-        *y=0;   // First Line
+        gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos);
 
 
-        const wxChar* stop = text.c_str() + pos;
-        for ( const wxChar *p = text.c_str(); p < stop; p++ )
-        {
-            if (*p == _T('\n'))
-            {
-                (*y)++;
-                *x=0;
-            }
-            else
-                (*x)++;
-        }
+        if ( y )
+            *y = gtk_text_iter_get_line(&iter);
+        if ( x )
+            *x = gtk_text_iter_get_line_offset(&iter);
     }
     else // single line control
     {
         if ( pos <= GTK_ENTRY(m_text)->text_length )
         {
     }
     else // single line control
     {
         if ( pos <= GTK_ENTRY(m_text)->text_length )
         {
-            *y = 0;
-            *x = pos;
+            if ( y )
+                *y = 0;
+            if ( x )
+                *x = pos;
         }
         else
         {
             // index out of bounds
         }
         else
         {
             // index out of bounds
-            return FALSE;
+            return false;
         }
     }
 
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 long wxTextCtrl::XYToPosition(long x, long y ) const
 {
 }
 
 long wxTextCtrl::XYToPosition(long x, long y ) const
 {
-    if (!(m_windowStyle & wxTE_MULTILINE)) return 0;
+    if ( IsSingleLine() )
+        return 0;
 
 
-    long pos=0;
-    for( int i=0; i<y; i++ ) pos += GetLineLength(i) + 1; // one for '\n'
+    GtkTextIter iter;
+    if (y >= gtk_text_buffer_get_line_count (m_buffer))
+        return -1;
 
 
-    pos += x;
-    return pos;
+    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
 {
 }
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
-    wxString str = GetLineText (lineNo);
-    return (int) str.Length();
+    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
+    {
+        wxString str = GetLineText (lineNo);
+        return (int) str.length();
+    }
 }
 
 int wxTextCtrl::GetNumberOfLines() const
 {
 }
 
 int wxTextCtrl::GetNumberOfLines() const
 {
-    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 );
-
-        if (text)
-        {
-            int currentLine = 0;
-            for (int i = 0; i < len; i++ )
-            {
-                if (text[i] == '\n')
-                    currentLine++;
-            }
-            g_free( text );
-
-            // currentLine is 0 based, add 1 to get number of lines
-            return currentLine + 1;
-        }
-        else
-        {
-            return 0;
-        }
+        return gtk_text_buffer_get_line_count( m_buffer );
     }
     }
-    else
+    else // single line
     {
         return 1;
     }
     {
         return 1;
     }
@@ -672,343 +1240,459 @@ int wxTextCtrl::GetNumberOfLines() const
 
 void wxTextCtrl::SetInsertionPoint( long pos )
 {
 
 void wxTextCtrl::SetInsertionPoint( long pos )
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 
-    if (m_windowStyle & wxTE_MULTILINE)
+    if ( IsMultiLine() )
     {
     {
-        /* 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);
+        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
+    {
+        // FIXME: Is the editable's cursor really uptodate without double set_position in GTK2?
+        gtk_editable_set_position(GTK_EDITABLE(m_text), int(pos));
+    }
+}
 
 
-        /* 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. */
+void wxTextCtrl::SetInsertionPointEnd()
+{
+    SetInsertionPoint(-1);
+}
 
 
-        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 );
+void wxTextCtrl::SetEditable( bool editable )
+{
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 
-        gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+    if ( IsMultiLine() )
+    {
+        gtk_text_view_set_editable( GTK_TEXT_VIEW(m_text), editable );
+    }
+    else
+    {
+        gtk_editable_set_editable( GTK_EDITABLE(m_text), editable );
+    }
+}
 
 
-        /* bring editable's cursor uptodate. another bug in GTK. */
+bool wxTextCtrl::Enable( bool enable )
+{
+    if (!wxWindowBase::Enable(enable))
+    {
+        // nothing to do
+        return false;
+    }
 
 
-        GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+    if ( IsMultiLine() )
+    {
+        SetEditable( enable );
     }
     else
     {
     }
     else
     {
-        gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
+        gtk_widget_set_sensitive( m_text, enable );
+    }
 
 
-        /* bring editable's cursor uptodate. bug in GTK. */
+    return true;
+}
 
 
-        GTK_EDITABLE(m_text)->current_pos = pos;
+// 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 enable )
+{
+    // 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.Ok())
+    {
+        // Need to set twice or it'll optimize the useful stuff out
+        if (oldColour == * wxWHITE)
+            SetBackgroundColour(*wxBLACK);
+        else
+            SetBackgroundColour(*wxWHITE);
+        SetBackgroundColour(oldColour);
     }
 }
 
     }
 }
 
-void wxTextCtrl::SetInsertionPointEnd()
+void wxTextCtrl::MarkDirty()
 {
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    m_modified = true;
+}
 
 
-    if (m_windowStyle & wxTE_MULTILINE)
-        SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text)));
-    else
-        gtk_entry_set_position( GTK_ENTRY(m_text), -1 );
+void wxTextCtrl::DiscardEdits()
+{
+    m_modified = false;
 }
 
 }
 
-void wxTextCtrl::SetEditable( bool editable )
+// ----------------------------------------------------------------------------
+// max text length support
+// ----------------------------------------------------------------------------
+
+bool wxTextCtrl::IgnoreTextUpdate()
 {
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    if ( m_countUpdatesToIgnore > 0 )
+    {
+        m_countUpdatesToIgnore--;
 
 
-    if (m_windowStyle & wxTE_MULTILINE)
-        gtk_text_set_editable( GTK_TEXT(m_text), editable );
-    else
-        gtk_entry_set_editable( GTK_ENTRY(m_text), editable );
+        return true;
+    }
+
+    return false;
 }
 
 }
 
-void wxTextCtrl::SetSelection( long from, long to )
+bool wxTextCtrl::MarkDirtyOnChange()
 {
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    if ( m_dontMarkDirty )
+    {
+        m_dontMarkDirty = false;
+
+        return false;
+    }
 
 
-    gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+    return true;
 }
 
 }
 
-void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
+void wxTextCtrl::SetMaxLength(unsigned long len)
 {
 {
-//    SetInsertionPoint( pos );
+    if ( !HasFlag(wxTE_MULTILINE) )
+    {
+        gtk_entry_set_max_length(GTK_ENTRY(m_text), len);
+
+        // there is a bug in GTK+ 1.2.x: "changed" signal is emitted even if
+        // we had tried to enter more text than allowed by max text length and
+        // the text wasn't really changed
+        //
+        // to detect this and generate TEXT_MAXLEN event instead of
+        // TEXT_CHANGED one in this case we also catch "insert_text" signal
+        //
+        // when max len is set to 0 we disconnect our handler as it means that
+        // we shouldn't check anything any more
+        if ( len )
+        {
+            g_signal_connect (m_text, "insert_text",
+                              G_CALLBACK (gtk_insert_text_callback), this);
+        }
+        else // no checking
+        {
+            g_signal_handlers_disconnect_by_func (m_text,
+                    (gpointer) gtk_insert_text_callback, this);
+        }
+    }
 }
 
 }
 
-long wxTextCtrl::GetInsertionPoint() const
+void wxTextCtrl::SetSelection( long from, long to )
 {
 {
-    wxCHECK_MSG( m_text != NULL, 0, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 
-    return (long) GTK_EDITABLE(m_text)->current_pos;
-}
+    if (from == -1 && to == -1)
+    {
+        from = 0;
+        to = GetValue().length();
+    }
 
 
-long wxTextCtrl::GetLastPosition() const
-{
-    wxCHECK_MSG( m_text != NULL, 0, _T("invalid text ctrl") );
+    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 );
 
 
-    int pos = 0;
-    if (m_windowStyle & wxTE_MULTILINE)
-        pos = gtk_text_get_length( GTK_TEXT(m_text) );
+        gtk_text_buffer_place_cursor( m_buffer, &toi );
+        gtk_text_buffer_move_mark_by_name( m_buffer, "selection_bound", &fromi );
+    }
     else
     else
-        pos = GTK_ENTRY(m_text)->text_length;
+    {
+        gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+    }
+}
 
 
-    return (long)pos;
+void wxTextCtrl::ShowPosition( long pos )
+{
+    if (IsMultiLine())
+    {
+        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);
+    }
 }
 
 }
 
-void wxTextCtrl::Remove( long from, long to )
+wxTextCtrlHitTestResult
+wxTextCtrl::HitTest(const wxPoint& pt, long *pos) const
 {
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    if ( !IsMultiLine() )
+    {
+        // not supported
+        return wxTE_HT_UNKNOWN;
+    }
 
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+    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
+    );
 
 
-    gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+    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);
 
 
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+    return wxTE_HT_ON_TEXT;
 }
 
 }
 
-void wxTextCtrl::Replace( long from, long to, const wxString &value )
+long wxTextCtrl::GetInsertionPoint() const
 {
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
 
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+    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.
 
 
-    gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+        GtkTextMark *mark = gtk_text_buffer_get_insert( m_buffer );
+        GtkTextIter cursor;
+        gtk_text_buffer_get_iter_at_mark( m_buffer, &cursor, mark );
 
 
-    if (!value.IsEmpty())
+        return gtk_text_iter_get_offset( &cursor );
+    }
+    else
     {
     {
-        gint pos = (gint)from;
-#if wxUSE_UNICODE
-        wxWX2MBbuf buf = value.mbc_str();
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &pos );
-#else
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos );
-#endif
+        return (long) gtk_editable_get_position(GTK_EDITABLE(m_text));
     }
     }
-
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 }
 
 }
 
-void wxTextCtrl::Cut()
+wxTextPos wxTextCtrl::GetLastPosition() const
 {
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
 
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+    int pos = 0;
 
 
-#if (GTK_MINOR_VERSION > 0)
-    gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );
-#else
-    gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 );
-#endif
+    if ( IsMultiLine() )
+    {
+        GtkTextIter end;
+        gtk_text_buffer_get_end_iter( m_buffer, &end );
+
+        pos = gtk_text_iter_get_offset( &end );
+    }
+    else
+    {
+        pos = GTK_ENTRY(m_text)->text_length;
+    }
 
 
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+    return (long)pos;
 }
 
 }
 
-void wxTextCtrl::Copy()
+void wxTextCtrl::Remove( long from, long to )
 {
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, 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 ( 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 );
+
+        gtk_text_buffer_delete( m_buffer, &fromi, &toi );
+    }
+    else // single line
+        gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 }
 
 }
 
-void wxTextCtrl::Paste()
+void wxTextCtrl::Replace( long from, long to, const wxString &value )
 {
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+    Remove( from, to );
 
 
-#if (GTK_MINOR_VERSION > 0)
-    gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );
-#else
-    gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 );
-#endif
-
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+    if (!value.empty())
+    {
+        SetInsertionPoint( from );
+        WriteText( value );
+    }
 }
 
 }
 
-bool wxTextCtrl::CanCopy() const
+void wxTextCtrl::Cut()
 {
 {
-    // Can copy if there's a selection
-    long from, to;
-    GetSelection(& from, & to);
-    return (from != to) ;
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
+
+    if ( IsMultiLine() )
+        g_signal_emit_by_name (m_text, "cut-clipboard");
+    else
+        gtk_editable_cut_clipboard(GTK_EDITABLE(m_text));
 }
 
 }
 
-bool wxTextCtrl::CanCut() const
+void wxTextCtrl::Copy()
 {
 {
-    // Can cut if there's a selection
-    long from, to;
-    GetSelection(& from, & to);
-    return (from != to) ;
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
+
+    if ( IsMultiLine() )
+        g_signal_emit_by_name (m_text, "copy-clipboard");
+    else
+        gtk_editable_copy_clipboard(GTK_EDITABLE(m_text));
 }
 
 }
 
-bool wxTextCtrl::CanPaste() const
+void wxTextCtrl::Paste()
 {
 {
-    return IsEditable() ;
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
+
+    if ( IsMultiLine() )
+        g_signal_emit_by_name (m_text, "paste-clipboard");
+    else
+        gtk_editable_paste_clipboard(GTK_EDITABLE(m_text));
 }
 
 // Undo/redo
 void wxTextCtrl::Undo()
 {
     // TODO
 }
 
 // Undo/redo
 void wxTextCtrl::Undo()
 {
     // TODO
-    wxFAIL_MSG( _T("wxTextCtrl::Undo not implemented") );
+    wxFAIL_MSG( wxT("wxTextCtrl::Undo not implemented") );
 }
 
 void wxTextCtrl::Redo()
 {
     // TODO
 }
 
 void wxTextCtrl::Redo()
 {
     // TODO
-    wxFAIL_MSG( _T("wxTextCtrl::Redo not implemented") );
+    wxFAIL_MSG( wxT("wxTextCtrl::Redo not implemented") );
 }
 
 bool wxTextCtrl::CanUndo() const
 {
     // TODO
 }
 
 bool wxTextCtrl::CanUndo() const
 {
     // TODO
-    wxFAIL_MSG( _T("wxTextCtrl::CanUndo not implemented") );
-    return FALSE;
+    //wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
+    return false;
 }
 
 bool wxTextCtrl::CanRedo() const
 {
     // TODO
 }
 
 bool wxTextCtrl::CanRedo() const
 {
     // TODO
-    wxFAIL_MSG( _T("wxTextCtrl::CanRedo not implemented") );
-    return FALSE;
+    //wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
+    return false;
 }
 
 // If the return values from and to are the same, there is no
 // selection.
 }
 
 // If the return values from and to are the same, there is no
 // selection.
-void wxTextCtrl::GetSelection(long* from, long* to) const
-{
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
-
-    if (!(GTK_EDITABLE(m_text)->has_selection))
-    {
-        if (from) *from = 0;
-        if (to)   *to = 0;
-        return;
-    }
-
-    if (from) *from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
-    if (to)   *to = (long) GTK_EDITABLE(m_text)->selection_end_pos;
-}
-
-bool wxTextCtrl::IsEditable() const
-{
-    wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") );
-
-    return GTK_EDITABLE(m_text)->editable;
+void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
+{
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
+
+    gint from = -1;
+    gint to = -1;
+    bool haveSelection = false;
+
+     if ( IsMultiLine() )
+     {
+         GtkTextIter ifrom, ito;
+         if ( gtk_text_buffer_get_selection_bounds(m_buffer, &ifrom, &ito) )
+         {
+             haveSelection = true;
+             from = gtk_text_iter_get_offset(&ifrom);
+             to = gtk_text_iter_get_offset(&ito);
+         }
+     }
+     else  // not multi-line
+     {
+         if ( gtk_editable_get_selection_bounds( GTK_EDITABLE(m_text),
+                                                 &from, &to) )
+         {
+             haveSelection = true;
+         }
+     }
+
+     if (! haveSelection )
+          from = to = GetInsertionPoint();
+
+     if ( from > to )
+     {
+         // exchange them to be compatible with wxMSW
+         gint tmp = from;
+         from = to;
+         to = tmp;
+     }
+
+    if ( fromOut )
+        *fromOut = from;
+    if ( toOut )
+        *toOut = to;
 }
 
 }
 
-void wxTextCtrl::Clear()
-{
-    SetValue( _T("") );
-}
 
 
-void wxTextCtrl::OnChar( wxKeyEvent &key_event )
+bool wxTextCtrl::IsEditable() const
 {
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
 
 
-    if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
+    if ( IsMultiLine() )
     {
     {
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
-        event.SetEventObject(this);
-        if (GetEventHandler()->ProcessEvent(event)) return;
+        return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text));
+    }
+    else
+    {
+        return gtk_editable_get_editable(GTK_EDITABLE(m_text));
     }
     }
-
-    key_event.Skip();
-}
-
-#if wxUSE_STD_IOSTREAM
-int wxTextCtrl::overflow( int WXUNUSED(c) )
-{
-    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;
 }
 
 }
 
-int wxTextCtrl::sync()
+bool wxTextCtrl::IsModified() const
 {
 {
-    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;
+    return m_modified;
 }
 
 }
 
-int wxTextCtrl::underflow()
+void wxTextCtrl::Clear()
 {
 {
-    return EOF;
+    SetValue( wxEmptyString );
 }
 }
-#endif
 
 
-wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
+void wxTextCtrl::OnChar( wxKeyEvent &key_event )
 {
 {
-    AppendText(s);
-    return *this;
-}
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 
-wxTextCtrl& wxTextCtrl::operator<<(float f)
-{
-    static char buf[100];
-    sprintf(buf, "%.2f", f);
-    AppendText(buf);
-    return *this;
-}
+    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 ( GetEventHandler()->ProcessEvent(event) )
+                return;
+        }
 
 
-wxTextCtrl& wxTextCtrl::operator<<(double d)
-{
-    static char buf[100];
-    sprintf(buf, "%.2f", d);
-    AppendText(buf);
-    return *this;
-}
+        // FIXME: this is not the right place to do it, wxDialog::OnCharHook()
+        //        probably is
+        if ( IsSingleLine() )
+        {
+            // This will invoke the dialog default action, such
+            // as the clicking the default button.
 
 
-wxTextCtrl& wxTextCtrl::operator<<(int i)
-{
-    static char buf[100];
-    sprintf(buf, "%i", i);
-    AppendText(buf);
-    return *this;
-}
+            wxWindow *top_frame = m_parent;
+            while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
+                top_frame = top_frame->GetParent();
 
 
-wxTextCtrl& wxTextCtrl::operator<<(long i)
-{
-    static char buf[100];
-    sprintf(buf, "%ld", i);
-    AppendText(buf);
-    return *this;
-}
+            if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))
+            {
+                GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
 
 
-wxTextCtrl& wxTextCtrl::operator<<(const char c)
-{
-    char buf[2];
+                if (window->default_widget)
+                {
+                    gtk_widget_activate (window->default_widget);
+                    return;
+                }
+            }
+        }
+    }
 
 
-    buf[0] = c;
-    buf[1] = 0;
-    AppendText(buf);
-    return *this;
+    key_event.Skip();
 }
 
 GtkWidget* wxTextCtrl::GetConnectWidget()
 }
 
 GtkWidget* wxTextCtrl::GetConnectWidget()
@@ -1016,93 +1700,125 @@ GtkWidget* wxTextCtrl::GetConnectWidget()
     return GTK_WIDGET(m_text);
 }
 
     return GTK_WIDGET(m_text);
 }
 
-bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxTextCtrl::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
 {
-    if (m_windowStyle & wxTE_MULTILINE)
-        return (window == GTK_TEXT(m_text)->text_area);
+    if ( IsMultiLine() )
+    {
+        return gtk_text_view_get_window(GTK_TEXT_VIEW(m_text),
+                                        GTK_TEXT_WINDOW_TEXT );
+    }
     else
     else
-        return (window == GTK_ENTRY(m_text)->text_area);
+    {
+        return GTK_ENTRY(m_text)->text_area;
+    }
 }
 
 // the font will change for subsequent text insertiongs
 bool wxTextCtrl::SetFont( const wxFont &font )
 {
 }
 
 // the font will change for subsequent text insertiongs
 bool wxTextCtrl::SetFont( const wxFont &font )
 {
-    wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
 
 
-    if ( !wxWindowBase::SetFont(font) )
+    if ( !wxTextCtrlBase::SetFont(font) )
     {
         // font didn't change, nothing to do
     {
         // font didn't change, nothing to do
-        return FALSE;
+        return false;
     }
 
     }
 
-    if ( m_windowStyle & wxTE_MULTILINE )
+    if ( IsMultiLine() )
     {
     {
-        // for compatibility with other ports: the font is a global controls
-        // characteristic, so change the font globally
-        wxString value = GetValue();
-        if ( !value.IsEmpty() )
-        {
-            Clear();
+        SetUpdateFont(true);
 
 
-            AppendText(value);
-        }
+        m_defaultStyle.SetFont(font);
+
+        ChangeFontGlobally();
     }
 
     }
 
-    return TRUE;
+    return true;
 }
 
 }
 
-bool wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) )
+void wxTextCtrl::ChangeFontGlobally()
 {
 {
-    wxCHECK_MSG( m_text != NULL, FALSE, _T("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(),
+                  _T("shouldn't be called for single line controls") );
+
+    wxString value = GetValue();
+    if ( !value.empty() )
+    {
+        SetUpdateFont(false);
 
 
-    // doesn't work
-    return FALSE;
+        Clear();
+        AppendText(value);
+    }
 }
 
 }
 
-bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
+bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
 {
 {
-    wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") );
+    if ( !wxControl::SetForegroundColour(colour) )
+        return false;
 
 
-    wxControl::SetBackgroundColour( colour );
+    // update default fg colour too
+    m_defaultStyle.SetTextColour(colour);
 
 
-    if (!m_widget->window)
-        return FALSE;
+    return true;
+}
 
 
-    wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
-    if (sysbg.Red() == colour.Red() &&
-        sysbg.Green() == colour.Green() &&
-        sysbg.Blue() == colour.Blue())
-    {
-        return FALSE; // FIXME or TRUE?
-    }
+bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
+{
+    wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
+
+    if ( !wxControl::SetBackgroundColour( colour ) )
+        return false;
 
     if (!m_backgroundColour.Ok())
 
     if (!m_backgroundColour.Ok())
-        return FALSE;
+        return false;
 
 
-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-        GdkWindow *window = GTK_TEXT(m_text)->text_area;
-        if (!window)
-            return FALSE;
-        m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
-        gdk_window_set_background( window, m_backgroundColour.GetColor() );
-        gdk_window_clear( window );
-    }
+    // change active background color too
+    m_defaultStyle.SetBackgroundColour( colour );
 
 
-    return TRUE;
+    return true;
 }
 
 }
 
-void wxTextCtrl::ApplyWidgetStyle()
+bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
 {
 {
-    if (m_windowStyle & wxTE_MULTILINE)
+    if ( IsMultiLine() )
     {
     {
-        // how ?
-    }
-    else
-    {
-        SetWidgetStyle();
-        gtk_widget_set_style( m_text, m_widgetStyle );
+        if ( style.IsDefault() )
+        {
+            // nothing to do
+            return true;
+        }
+
+        gint l = gtk_text_buffer_get_char_count( m_buffer );
+
+        wxCHECK_MSG( start >= 0 && end <= l, false,
+                     _T("invalid range in wxTextCtrl::SetStyle") );
+
+        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 );
+
+        // 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
+        // colours for the others
+        wxTextAttr attr = wxTextAttr::Combine(style, m_defaultStyle, this);
+
+        wxGtkTextApplyTagsFromAttr( m_widget, m_buffer, attr, &starti, &endi );
+
+        return true;
     }
     }
+
+    // else single line
+    // cannot do this for GTK+'s Entry widget
+    return false;
+}
+
+void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+    gtk_widget_modify_style(m_text, style);
 }
 
 void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))
 }
 
 void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))
@@ -1154,3 +1870,144 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
 {
     event.Enable( CanRedo() );
 }
 {
     event.Enable( CanRedo() );
 }
+
+wxSize wxTextCtrl::DoGetBestSize() const
+{
+    // FIXME should be different for multi-line controls...
+    wxSize ret( wxControl::DoGetBestSize() );
+    wxSize best(80, ret.y);
+    CacheBestSize(best);
+    return best;
+}
+
+// ----------------------------------------------------------------------------
+// freeze/thaw
+// ----------------------------------------------------------------------------
+
+void wxTextCtrl::Freeze()
+{
+    wxCHECK_RET(m_text != NULL, wxT("invalid text ctrl"));
+
+    if ( HasFlag(wxTE_MULTILINE) )
+    {
+        if (m_freezeCount++ == 0)
+        {
+            // freeze textview updates and remove buffer
+            g_signal_connect (m_text, "expose_event",
+                              G_CALLBACK (gtk_text_exposed_callback), this);
+            g_signal_connect (m_widget, "expose_event",
+                              G_CALLBACK (gtk_text_exposed_callback), this);
+            gtk_widget_set_sensitive(m_widget, false);
+            g_object_ref(m_buffer);
+            GtkTextBuffer* buf_new = gtk_text_buffer_new(NULL);
+            GtkTextMark* mark = GTK_TEXT_VIEW(m_text)->first_para_mark;
+            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);
+            // This mark should be deleted when the buffer is changed,
+            // but it's not (in GTK+ up to at least 2.10.6).
+            // Otherwise these anonymous marks start to build up in the buffer,
+            // and Freeze takes longer and longer each time it is called.
+            if (GTK_IS_TEXT_MARK(mark) && !gtk_text_mark_get_deleted(mark))
+                gtk_text_buffer_delete_mark(m_buffer, mark);
+        }
+    }
+}
+
+void wxTextCtrl::Thaw()
+{
+    if ( HasFlag(wxTE_MULTILINE) )
+    {
+        wxCHECK_RET(m_freezeCount != 0, _T("Thaw() without matching Freeze()"));
+
+        if (--m_freezeCount == 0)
+        {
+            // Reattach buffer and thaw textview updates
+            gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), m_buffer);
+            g_object_unref(m_buffer);
+            gtk_widget_set_sensitive(m_widget, true);
+            g_signal_handlers_disconnect_by_func (m_widget,
+                    (gpointer) gtk_text_exposed_callback, this);
+            g_signal_handlers_disconnect_by_func (m_text,
+                    (gpointer) gtk_text_exposed_callback, this);
+            if (m_showPositionOnThaw != NULL)
+            {
+                gtk_text_view_scroll_mark_onscreen(
+                    GTK_TEXT_VIEW(m_text), m_showPositionOnThaw);
+                m_showPositionOnThaw = NULL;
+            }
+        }
+    }
+}
+
+// ----------------------------------------------------------------------------
+// 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)
+{
+    event.Skip();
+    if( !HasFlag(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);
+}
+
+bool wxTextCtrl::GTKProcessEvent(wxEvent& event) const
+{
+    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);
+}