Image size fix

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 2fe6b59267fbbc69886ac4372055417b439e097c..4d122f975759977e2a560f04f97fa07791d7ff68 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -1,57 +1,78 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "textctrl.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_TEXTCTRL
+

 #include "wx/textctrl.h"
 #include "wx/textctrl.h"

-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/log.h"
-#include "wx/settings.h"
-#include "wx/panel.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 "wx/strconv.h"
 #include "wx/fontutil.h"        // for wxNativeFontInfo (GetNativeFontInfo())
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>

-#include "wx/math.h"

 
 #include "wx/gtk/private.h"
 
 #include "wx/gtk/private.h"

-#include <gdk/gdkkeysyms.h>
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern bool       g_blockEventsOnDrag;
-extern wxCursor   g_globalCursor;
-extern wxWindowGTK *g_delayedFocus;

 
 // ----------------------------------------------------------------------------
 // helpers
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // helpers
 // ----------------------------------------------------------------------------
 

-#ifdef __WXGTK20__
-static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
+extern "C" {
+static void wxGtkOnRemoveTag(GtkTextBuffer *buffer,
+                             GtkTextTag *tag,
+                             GtkTextIter * WXUNUSED(start),
+                             GtkTextIter * WXUNUSED(end),
+                             char *prefix)
+{
+    gchar *name;
+    g_object_get (tag, "name", &name, NULL);
+
+    if (!name || strncmp(name, prefix, strlen(prefix)))
+        // anonymous tag or not starting with prefix - don't remove
+        g_signal_stop_emission_by_name (buffer, "remove_tag");
+
+    g_free(name);
+}
+}
+
+// remove all tags starting with the given prefix from the start..end range
+static void
+wxGtkTextRemoveTagsWithPrefix(GtkTextBuffer *text_buffer,
+                              const char *prefix,
+                              GtkTextIter *start,
+                              GtkTextIter *end)
+{
+    gulong remove_handler_id = g_signal_connect
+                               (
+                                text_buffer,
+                                "remove_tag",
+                                G_CALLBACK(wxGtkOnRemoveTag),
+                                gpointer(prefix)
+                               );
+    gtk_text_buffer_remove_all_tags(text_buffer, start, end);
+    g_signal_handler_disconnect(text_buffer, remove_handler_id);
+}
+
+static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
+                                       GtkTextBuffer *text_buffer,

                                        const wxTextAttr& attr,
                                        GtkTextIter *start,
                                        GtkTextIter *end)
                                        const wxTextAttr& attr,
                                        GtkTextIter *start,
                                        GtkTextIter *end)


@@ -61,10 +82,13 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
 
     if (attr.HasFont())
     {
 
     if (attr.HasFont())
     {

-        char *font_string;
-        PangoFontDescription *font_description = attr.GetFont().GetNativeFontInfo()->description;
-        font_string = pango_font_description_to_string(font_description);
-        g_snprintf(buf, sizeof(buf), "WXFONT %s", font_string);
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFONT", start, end);
+
+        wxFont font(attr.GetFont());
+
+        PangoFontDescription *font_description = font.GetNativeFontInfo()->description;
+        wxGtkString font_string(pango_font_description_to_string(font_description));
+        g_snprintf(buf, sizeof(buf), "WXFONT %s", font_string.c_str());

         tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
                                          buf );
         if (!tag)
         tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
                                          buf );
         if (!tag)


@@ -72,12 +96,26 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
                                               "font-desc", font_description,
                                               NULL );
         gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
                                               "font-desc", font_description,
                                               NULL );
         gtk_text_buffer_apply_tag (text_buffer, tag, start, end);

-        g_free (font_string);
+
+        if (font.GetUnderlined())
+        {
+            g_snprintf(buf, sizeof(buf), "WXFONTUNDERLINE");
+            tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
+                                             buf );
+            if (!tag)
+                tag = gtk_text_buffer_create_tag( text_buffer, buf,
+                                                  "underline-set", TRUE,
+                                                  "underline", PANGO_UNDERLINE_SINGLE,
+                                                  NULL );
+            gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
+        }

     }
 
     if (attr.HasTextColour())
     {
     }
 
     if (attr.HasTextColour())
     {

-        GdkColor *colFg = attr.GetTextColour().GetColor();
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFORECOLOR", start, end);
+
+        const GdkColor *colFg = attr.GetTextColour().GetColor();

         g_snprintf(buf, sizeof(buf), "WXFORECOLOR %d %d %d",
                    colFg->red, colFg->green, colFg->blue);
         tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
         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 ),


@@ -90,7 +128,9 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
 
     if (attr.HasBackgroundColour())
     {
 
     if (attr.HasBackgroundColour())
     {

-        GdkColor *colBg = attr.GetBackgroundColour().GetColor();
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXBACKCOLOR", start, end);
+
+        const GdkColor *colBg = attr.GetBackgroundColour().GetColor();

         g_snprintf(buf, sizeof(buf), "WXBACKCOLOR %d %d %d",
                    colBg->red, colBg->green, colBg->blue);
         tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
         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 ),


@@ -100,101 +140,167 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
                                               "background-gdk", colBg, NULL );
         gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
     }
                                               "background-gdk", colBg, NULL );
         gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
     }

-}

 
 

-static void wxGtkTextInsert(GtkWidget *text,
-                            GtkTextBuffer *text_buffer,
-                            const wxTextAttr& attr,
-                            wxCharBuffer buffer)
+    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);

 
 

-{
-    gint start_offset;
-    GtkTextIter iter, start;
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXALIGNMENT", start, end);

 
 

-    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) );
+        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 before gtk+-2.11.0 with pango-1.17 being available
+// (but if new enough pango isn't available it's a mere gtk warning)
+#if GTK_CHECK_VERSION(2,11,0)
+            case wxTEXT_ALIGNMENT_JUSTIFIED:
+                if (!gtk_check_version(2,11,0))
+                    align = GTK_JUSTIFY_FILL;
+                else
+                    align = GTK_JUSTIFY_LEFT;
+                break;
+#endif
+        }

 
 

-    gtk_text_buffer_get_iter_at_offset (text_buffer, &start, start_offset);
+        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 );
+    }

 
 

-    wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter);
-}
-#else
-static void wxGtkTextInsert(GtkWidget *text,
-                            const wxTextAttr& attr,
-                            const char *txt,
-                            size_t len)
-{
-    GdkFont *font = attr.HasFont() ? attr.GetFont().GetInternalFont()
-                                   : NULL;
+    if (attr.HasLeftIndent())
+    {
+        // Indentation attribute

 
 

-    GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor()
-                                           : NULL;
+        // 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);

 
 

-    GdkColor *colBg = attr.HasBackgroundColour()
-                        ? attr.GetBackgroundColour().GetColor()
-                        : NULL;
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXINDENT", start, end);

 
 

-    gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len );
-}
-#endif // GTK 1.x
+        // Convert indent from 1/10th of a mm into pixels
+        float factor =
+            (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
+                      gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;

 
 

-// ----------------------------------------------------------------------------
-// "insert_text" for GtkEntry
-// ----------------------------------------------------------------------------
+        const int indent = (int)(factor * attr.GetLeftIndent());
+        const int subIndent = (int)(factor * attr.GetLeftSubIndent());

 
 

-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();
+        gint gindent;
+        gint gsubindent;

 
 

-    // we should only be called if we have a max len limit at all
-    GtkEntry *entry = GTK_ENTRY (editable);
+        if (subIndent >= 0)
+        {
+            gindent = indent;
+            gsubindent = -subIndent;
+        }
+        else
+        {
+            gindent = -subIndent;
+            gsubindent = indent;
+        }

 
 

-    wxCHECK_RET( entry->text_max_length, _T("shouldn't be called") );
+        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);
+    }

 
 

-    // 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 )
+    if (attr.HasTabs())

     {
     {

-        // we don't need to run the base class version at all
-        gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text");
+        // Set tab stops
+
+        // Clear old tabs
+        GtkTextIter para_start, para_end = *end;
+        gtk_text_buffer_get_iter_at_line( text_buffer,
+                                          &para_start,
+                                          gtk_text_iter_get_line(start) );
+        gtk_text_iter_forward_line(&para_end);
+
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXTABS", start, end);

 
 

-        // remember that the next changed signal is to be ignored to avoid
-        // generating a dummy wxEVT_COMMAND_TEXT_UPDATED event
-        win->IgnoreNextTextUpdate();
+        const wxArrayInt& tabs = attr.GetTabs();

 
 

-        // 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 );
+        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 buftag = tagname.utf8_str();
+
+        tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
+                                        buftag );
+        if (!tag)
+        {
+            // Factor to convert from 1/10th of a mm into pixels
+            float factor =
+                (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
+                          gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;
+
+            PangoTabArray* tabArray = pango_tab_array_new(tabs.GetCount(), TRUE);
+            for (size_t i = 0; i < tabs.GetCount(); i++)
+                pango_tab_array_set_tab(tabArray, i, PANGO_TAB_LEFT, (gint)(tabs[i] * factor));
+            tag = gtk_text_buffer_create_tag( text_buffer, buftag,
+                                              "tabs", tabArray, NULL );
+            pango_tab_array_free(tabArray);
+        }
+        gtk_text_buffer_apply_tag (text_buffer, tag, &para_start, &para_end);

     }
 }
     }
 }

+
+static void wxGtkTextInsert(GtkWidget *text,
+                            GtkTextBuffer *text_buffer,
+                            const wxTextAttr& attr,
+                            const wxCharBuffer& buffer)
+
+{
+    gint start_offset;
+    GtkTextIter iter, start;
+
+    gtk_text_buffer_get_iter_at_mark( text_buffer, &iter,
+                                     gtk_text_buffer_get_insert (text_buffer) );
+    start_offset = gtk_text_iter_get_offset (&iter);
+    gtk_text_buffer_insert( text_buffer, &iter, buffer, strlen(buffer) );
+
+    gtk_text_buffer_get_iter_at_offset (text_buffer, &start, start_offset);
+
+    wxGtkTextApplyTagsFromAttr(text, text_buffer, attr, &start, &iter);

 }
 
 }
 

-#ifdef __WXGTK20__

 // Implementation of wxTE_AUTO_URL for wxGTK2 by Mart Raudsepp,
 
 extern "C" {
 static void
 au_apply_tag_callback(GtkTextBuffer *buffer,
                       GtkTextTag *tag,
 // 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)
+                      GtkTextIter * WXUNUSED(start),
+                      GtkTextIter * WXUNUSED(end),
+                      gpointer WXUNUSED(textctrl))

 {
     if(tag == gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl"))
 {
     if(tag == gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl"))

-        g_signal_stop_emission_by_name(buffer, "apply_tag");
+        g_signal_stop_emission_by_name (buffer, "apply_tag");

 }
 }
 
 }
 }
 


@@ -204,7 +310,7 @@ au_apply_tag_callback(GtkTextBuffer *buffer,
 
 extern "C" {
 static gboolean
 
 extern "C" {
 static gboolean

-pred_whitespace (gunichar ch, gpointer user_data)
+pred_whitespace(gunichar ch, gpointer WXUNUSED(user_data))

 {
     return g_unichar_isspace(ch);
 }
 {
     return g_unichar_isspace(ch);
 }


@@ -212,7 +318,7 @@ pred_whitespace (gunichar ch, gpointer user_data)
 
 extern "C" {
 static gboolean
 
 extern "C" {
 static gboolean

-pred_non_whitespace (gunichar ch, gpointer user_data)
+pred_non_whitespace (gunichar ch, gpointer WXUNUSED(user_data))

 {
     return !g_unichar_isspace(ch);
 }
 {
     return !g_unichar_isspace(ch);
 }


@@ -220,7 +326,7 @@ pred_non_whitespace (gunichar ch, gpointer user_data)
 
 extern "C" {
 static gboolean
 
 extern "C" {
 static gboolean

-pred_nonpunct (gunichar ch, gpointer user_data)
+pred_nonpunct (gunichar ch, gpointer WXUNUSED(user_data))

 {
     return !g_unichar_ispunct(ch);
 }
 {
     return !g_unichar_ispunct(ch);
 }


@@ -228,7 +334,7 @@ pred_nonpunct (gunichar ch, gpointer user_data)
 
 extern "C" {
 static gboolean
 
 extern "C" {
 static gboolean

-pred_nonpunct_or_slash (gunichar ch, gpointer user_data)
+pred_nonpunct_or_slash (gunichar ch, gpointer WXUNUSED(user_data))

 {
     return !g_unichar_ispunct(ch) || ch == '/';
 }
 {
     return !g_unichar_ispunct(ch) || ch == '/';
 }


@@ -264,7 +370,7 @@ au_check_word( GtkTextIter *s, GtkTextIter *e )
 
     GtkTextIter start = *s, end = *e;
     GtkTextBuffer *buffer = gtk_text_iter_get_buffer(s);
 
     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 our special link tag
     GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl");
 


@@ -277,7 +383,7 @@ au_check_word( GtkTextIter *s, GtkTextIter *e )
     gtk_text_iter_backward_find_char( &end, pred_nonpunct_or_slash, NULL, &start );
     gtk_text_iter_forward_char(&end);
 
     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 );
+    wxGtkString text(gtk_text_iter_get_text( &start, &end ));

     size_t len = strlen(text), prefix_len;
     size_t n;
 
     size_t len = strlen(text), prefix_len;
     size_t n;
 


@@ -290,14 +396,14 @@ au_check_word( GtkTextIter *s, GtkTextIter *e )
 
     if(n < WXSIZEOF(URIPrefixes))
     {
 
     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);
+        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);
+        g_signal_handler_block (buffer, signal_id);

         gtk_text_buffer_apply_tag(buffer, tag, &start, &end);
         gtk_text_buffer_apply_tag(buffer, tag, &start, &end);

-        g_signal_handler_unblock(buffer, signal_id);
+        g_signal_handler_unblock (buffer, signal_id);

     }
 }
 }
     }
 }
 }


@@ -337,7 +443,7 @@ au_check_range(GtkTextIter *s,
 
 extern "C" {
 static void
 
 extern "C" {
 static void

-au_insert_text_callback(GtkTextBuffer *buffer,
+au_insert_text_callback(GtkTextBuffer * WXUNUSED(buffer),

                         GtkTextIter *end,
                         gchar *text,
                         gint len,
                         GtkTextIter *end,
                         gchar *text,
                         gint len,


@@ -369,7 +475,7 @@ au_insert_text_callback(GtkTextBuffer *buffer,
 
 extern "C" {
 static void
 
 extern "C" {
 static void

-au_delete_range_callback(GtkTextBuffer *buffer,
+au_delete_range_callback(GtkTextBuffer * WXUNUSED(buffer),

                          GtkTextIter *start,
                          GtkTextIter *end,
                          wxTextCtrl *win)
                          GtkTextIter *start,
                          GtkTextIter *end,
                          wxTextCtrl *win)


@@ -389,109 +495,90 @@ au_delete_range_callback(GtkTextBuffer *buffer,
 }
 
 
 }
 
 

-#endif
-

 //-----------------------------------------------------------------------------
 //  "changed"
 //-----------------------------------------------------------------------------
 
 extern "C" {
 static void
 //-----------------------------------------------------------------------------
 //  "changed"
 //-----------------------------------------------------------------------------
 
 extern "C" {
 static void

-gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
+gtk_text_changed_callback( GtkWidget * WXUNUSED(widget), wxTextCtrl *win )

 {
     if ( win->IgnoreTextUpdate() )
         return;
 
     if (!win->m_hasVMT) return;
 
 {
     if ( win->IgnoreTextUpdate() )
         return;
 
     if (!win->m_hasVMT) return;
 

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    win->SetModified();
-#ifndef __WXGTK20__
-    win->UpdateFontIfNeeded();
-#endif // !__WXGTK20__
+    if ( win->MarkDirtyOnChange() )
+        win->MarkDirty();

 
 

-    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
-    event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
+    win->SendTextUpdatedEvent();

 }
 }
 
 //-----------------------------------------------------------------------------
 }
 }
 
 //-----------------------------------------------------------------------------

-// "expose_event" from scrolled window and textview
+//  clipboard events: "copy-clipboard", "cut-clipboard", "paste-clipboard"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-#ifdef __WXGTK20__
-extern "C" {
-static gboolean
-gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win )
+// common part of the event handlers below
+static void
+handle_text_clipboard_callback( GtkWidget *widget, wxTextCtrl *win,
+                                wxEventType eventType, const gchar * signal_name)

 {
 {

-    return TRUE;
-}
+    wxClipboardTextEvent event( eventType, win->GetId() );
+    event.SetEventObject( win );
+    if ( win->HandleWindowEvent( event ) )
+    {
+        // don't let the default processing to take place if we did something
+        // ourselves in the event handler
+        g_signal_stop_emission_by_name (widget, signal_name);
+    }

 }
 }

-#endif

 
 

-//-----------------------------------------------------------------------------
-// "changed" from vertical scrollbar
-//-----------------------------------------------------------------------------
-
-#ifndef __WXGTK20__

 extern "C" {
 static void
 extern "C" {
 static void

-gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
+gtk_copy_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )

 {
 {

-    if (!win->m_hasVMT) return;
-
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    win->CalculateScrollbar();
-}
+    handle_text_clipboard_callback(
+        widget, win, wxEVT_COMMAND_TEXT_COPY, "copy-clipboard" );

 }
 }

-#endif
-
-// ----------------------------------------------------------------------------
-// redraw callback for multiline text
-// ----------------------------------------------------------------------------
-
-#ifndef __WXGTK20__

 
 

-// redrawing a GtkText from inside a wxYield() call results in crashes (the
-// text sample shows it in its "Add lines" command which shows wxProgressDialog
-// which implicitly calls wxYield()) so we override GtkText::draw() and simply
-// don't do anything if we're inside wxYield()
-
-extern bool wxIsInsideYield;
+static void
+gtk_cut_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
+{
+    handle_text_clipboard_callback(
+        widget, win, wxEVT_COMMAND_TEXT_CUT, "cut-clipboard" );
+}

 
 

-extern "C" {
-    typedef void (*GtkDrawCallback)(GtkWidget *widget, GdkRectangle *rect);
+static void
+gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
+{
+    handle_text_clipboard_callback(
+        widget, win, wxEVT_COMMAND_TEXT_PASTE, "paste-clipboard" );
+}

 }
 
 }
 

-static GtkDrawCallback gs_gtk_text_draw = NULL;
+//-----------------------------------------------------------------------------
+// "expose_event" from scrolled window and textview
+//-----------------------------------------------------------------------------

 
 extern "C" {
 
 extern "C" {

-static void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
+static gboolean
+gtk_text_exposed_callback( GtkWidget * WXUNUSED(widget),
+                           GdkEventExpose * WXUNUSED(event),
+                           wxTextCtrl * WXUNUSED(win) )

 {
 {

-    if ( !wxIsInsideYield )
-    {
-        wxCHECK_RET( gs_gtk_text_draw != wxgtk_text_draw,
-                     _T("infinite recursion in wxgtk_text_draw aborted") );
-
-        gs_gtk_text_draw(widget, rect);
-    }
+    return TRUE;

 }
 }
 
 }
 }
 

-#endif // __WXGTK20__

 
 //-----------------------------------------------------------------------------
 //  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)


@@ -506,7 +593,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 
     EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 

-#ifdef __WXGTK20__

     // wxTE_AUTO_URL wxTextUrl support. Currently only creates
     // wxTextUrlEvent in the same cases as wxMSW, more can be added here.
     EVT_MOTION      (wxTextCtrl::OnUrlMouseEvent)
     // wxTE_AUTO_URL wxTextUrl support. Currently only creates
     // wxTextUrlEvent in the same cases as wxMSW, more can be added here.
     EVT_MOTION      (wxTextCtrl::OnUrlMouseEvent)


@@ -516,31 +602,29 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_RIGHT_DOWN  (wxTextCtrl::OnUrlMouseEvent)
     EVT_RIGHT_UP    (wxTextCtrl::OnUrlMouseEvent)
     EVT_RIGHT_DCLICK(wxTextCtrl::OnUrlMouseEvent)
     EVT_RIGHT_DOWN  (wxTextCtrl::OnUrlMouseEvent)
     EVT_RIGHT_UP    (wxTextCtrl::OnUrlMouseEvent)
     EVT_RIGHT_DCLICK(wxTextCtrl::OnUrlMouseEvent)

-#endif

 END_EVENT_TABLE()
 
 void wxTextCtrl::Init()
 {
 END_EVENT_TABLE()
 
 void wxTextCtrl::Init()
 {

-    m_ignoreNextUpdate =
+    m_dontMarkDirty =

     m_modified = false;
     m_modified = false;

+
+    m_countUpdatesToIgnore = 0;
+

     SetUpdateFont(false);
     SetUpdateFont(false);

-    m_text =
-    m_vScrollbar = (GtkWidget *)NULL;
-#ifdef __WXGTK20__
-    m_frozenness = 0;
+
+    m_text = NULL;
+    m_showPositionOnThaw = NULL;

     m_gdkHandCursor = NULL;
     m_gdkXTermCursor = NULL;
     m_gdkHandCursor = NULL;
     m_gdkXTermCursor = NULL;

-#endif

 }
 
 wxTextCtrl::~wxTextCtrl()
 {
 }
 
 wxTextCtrl::~wxTextCtrl()
 {

-#ifdef __WXGTK20__

     if(m_gdkHandCursor)
         gdk_cursor_unref(m_gdkHandCursor);
     if(m_gdkXTermCursor)
         gdk_cursor_unref(m_gdkXTermCursor);
     if(m_gdkHandCursor)
         gdk_cursor_unref(m_gdkHandCursor);
     if(m_gdkXTermCursor)
         gdk_cursor_unref(m_gdkXTermCursor);

-#endif

 }
 
 wxTextCtrl::wxTextCtrl( wxWindow *parent,
 }
 
 wxTextCtrl::wxTextCtrl( wxWindow *parent,


@@ -566,9 +650,6 @@ bool wxTextCtrl::Create( wxWindow *parent,
                          const wxValidator& validator,
                          const wxString &name )
 {
                          const wxValidator& validator,
                          const wxString &name )
 {

-    m_needParent = true;
-    m_acceptsFocus = true;
-

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {


@@ -576,77 +657,40 @@ bool wxTextCtrl::Create( wxWindow *parent,
         return false;
     }
 
         return false;
     }
 

-
-    m_vScrollbarVisible = false;
-

     bool multi_line = (style & wxTE_MULTILINE) != 0;
 
     if (multi_line)
     {
     bool multi_line = (style & wxTE_MULTILINE) != 0;
 
     if (multi_line)
     {

-#ifdef __WXGTK20__

         // Create view
         m_text = gtk_text_view_new();
 
         m_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
 
         // Create view
         m_text = gtk_text_view_new();
 
         m_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
 

+        // create "ShowPosition" marker
+        GtkTextIter iter;
+        gtk_text_buffer_get_start_iter(m_buffer, &iter);
+        gtk_text_buffer_create_mark(m_buffer, "ShowPosition", &iter, true);
+

         // create scrolled window
         m_widget = gtk_scrolled_window_new( NULL, NULL );
         gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( m_widget ),
         // create scrolled window
         m_widget = gtk_scrolled_window_new( NULL, NULL );
         gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( m_widget ),

-                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
+                                        GTK_POLICY_AUTOMATIC,
+                                        style & wxTE_NO_VSCROLL
+                                            ? GTK_POLICY_NEVER
+                                            : GTK_POLICY_AUTOMATIC );
+        // for ScrollLines/Pages
+        m_scrollBar[1] = (GtkRange*)((GtkScrolledWindow*)m_widget)->vscrollbar;

 
         // Insert view into scrolled window
         gtk_container_add( GTK_CONTAINER(m_widget), m_text );
 
 
         // Insert view into scrolled window
         gtk_container_add( GTK_CONTAINER(m_widget), m_text );
 

-        // translate wx wrapping style to GTK+
-        GtkWrapMode wrap;
-        if ( HasFlag( wxTE_DONTWRAP ) )
-            wrap = GTK_WRAP_NONE;
-        else if ( HasFlag( wxTE_CHARWRAP ) )
-            wrap = GTK_WRAP_CHAR;
-        else if ( HasFlag( wxTE_WORDWRAP ) )
-            wrap = GTK_WRAP_WORD;
-        else // HasFlag(wxTE_BESTWRAP) always true as wxTE_BESTWRAP == 0
-        {
-            // GTK_WRAP_WORD_CHAR seems to be new in GTK+ 2.4
-#ifdef __WXGTK24__
-            wrap = GTK_WRAP_WORD_CHAR;
-#else
-            wrap = GTK_WRAP_WORD;
-#endif
-        }
-
-        gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );
+        GTKSetWrapMode();

 
 

-        if (!HasFlag(wxNO_BORDER))
-            gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );
+        GtkScrolledWindowSetBorder(m_widget, style);

 
         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 );
 
         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 // GTK+ 1
-        // create our control ...
-        m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
-
-        // ... and put into the upper left hand corner of the table
-        bool bHasHScrollbar = false;
-        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);
-
-        // always wrap words
-        gtk_text_set_word_wrap( GTK_TEXT(m_text), TRUE );
-
-        // 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);
-#endif // GTK+ 2/1

     }
     else
     {
     }
     else
     {


@@ -654,10 +698,9 @@ bool wxTextCtrl::Create( wxWindow *parent,
         m_widget =
         m_text = gtk_entry_new();
 
         m_widget =
         m_text = gtk_entry_new();
 

-#ifdef __WXGTK20__

         if (style & wxNO_BORDER)
         if (style & wxNO_BORDER)

-            g_object_set( GTK_ENTRY(m_text), "has-frame", FALSE, NULL );
-#endif
+            g_object_set (m_text, "has-frame", FALSE, NULL);
+            

     }
 
     m_parent->DoAddChild( this );
     }
 
     m_parent->DoAddChild( this );


@@ -667,111 +710,40 @@ bool wxTextCtrl::Create( wxWindow *parent,
     PostCreation(size);
 
     if (multi_line)
     PostCreation(size);
 
     if (multi_line)

+    {

         gtk_widget_show(m_text);
         gtk_widget_show(m_text);

+    }

 
 

-#ifndef __WXGTK20__
+    // We want to be notified about text changes.

     if (multi_line)
     {
     if (multi_line)
     {

-        gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed",
-          (GtkSignalFunc) gtk_scrollbar_changed_callback, (gpointer) this );
-
-        // only initialize gs_gtk_text_draw once, starting from the next the
-        // klass::draw will already be wxgtk_text_draw
-        if ( !gs_gtk_text_draw )
-        {
-            GtkDrawCallback&
-                draw = GTK_WIDGET_CLASS(GTK_OBJECT(m_text)->klass)->draw;
-
-            gs_gtk_text_draw = draw;
-
-            draw = wxgtk_text_draw;
-        }
+        g_signal_connect (m_buffer, "changed",
+                          G_CALLBACK (gtk_text_changed_callback), this);
+    }
+    else
+    {
+        g_signal_connect (m_text, "changed",
+                          G_CALLBACK (gtk_text_changed_callback), this);

     }
     }

-#endif // GTK+ 1.x

 
     if (!value.empty())
     {
 
     if (!value.empty())
     {

-#ifdef __WXGTK20__

         SetValue( value );
         SetValue( value );

-#else
-
-#if !GTK_CHECK_VERSION(1, 2, 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
-
-        gint tmp = 0;
-#if wxUSE_UNICODE
-        wxWX2MBbuf val = value.mbc_str();
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), val, strlen(val), &tmp );
-#else
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
-#endif
-
-        if (multi_line)
-        {
-            // Bring editable's cursor uptodate. Bug in GTK.
-            SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
-        }
-
-#endif

     }
 
     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)

-    {
-        if (!multi_line)
-            gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
-#ifdef __WXGTK20__
-        else
-            gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
-#else
-    }
-    else
-    {
-        if (multi_line)
-            gtk_text_set_editable( GTK_TEXT(m_text), 1 );
-#endif
-    }
+        GTKSetEditable();

 
 

-#ifdef __WXGTK20__
-    if (multi_line)
-    {
-        if (style & wxTE_RIGHT)
-            gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_RIGHT );
-        else if (style & wxTE_CENTRE)
-            gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_CENTER );
-        // Left justify (alignment) is the default and we don't need to apply GTK_JUSTIFY_LEFT
-    }
-    else
-    {
-#ifdef __WXGTK24__
-        // gtk_entry_set_alignment was introduced in gtk+-2.3.5
-        if (!gtk_check_version(2,4,0))
-        {
-            if (style & wxTE_RIGHT)
-                gtk_entry_set_alignment( GTK_ENTRY(m_text), 1.0 );
-            else if (style & wxTE_CENTRE)
-                gtk_entry_set_alignment( GTK_ENTRY(m_text), 0.5 );
-        }
-#endif
-    }
-#endif // __WXGTK20__
+    // left justification (alignment) is the default anyhow
+    if ( style & (wxTE_RIGHT | wxTE_CENTRE) )
+        GTKSetJustification();

 
 

-    // We want to be notified about text changes.
-#ifdef __WXGTK20__

     if (multi_line)
     {
     if (multi_line)
     {

-        g_signal_connect( G_OBJECT(m_buffer), "changed",
-            GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-
-        // .. and handle URLs on multi-line controls with wxTE_AUTO_URL style
+        // Handle URLs on multi-line controls with wxTE_AUTO_URL style

         if (style & wxTE_AUTO_URL)
         {
             GtkTextIter start, end;
         if (style & wxTE_AUTO_URL)
         {
             GtkTextIter start, end;


@@ -787,10 +759,10 @@ bool wxTextCtrl::Create( wxWindow *parent,
                                        NULL);
 
             // Check for URLs after each text change
                                        NULL);
 
             // Check for URLs after each text change

-            g_signal_connect_after( G_OBJECT(m_buffer), "insert_text",
-                GTK_SIGNAL_FUNC(au_insert_text_callback), (gpointer)this);
-            g_signal_connect_after( G_OBJECT(m_buffer), "delete_range",
-                GTK_SIGNAL_FUNC(au_delete_range_callback), (gpointer)this);
+            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
 
             // Block all wxUrl tag applying unless we do it ourselves, in which case we
             // block this callback temporarily. This takes care of gtk+ internal


@@ -798,8 +770,8 @@ bool wxTextCtrl::Create( wxWindow *parent,
             // 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.
             // which is undesired because only a part of the URL might be copied.
             // The insert-text signal emitted inside it will take care of newly formed
             // or wholly copied URLs.

-            g_signal_connect( G_OBJECT(m_buffer), "apply_tag",
-                GTK_SIGNAL_FUNC(au_apply_tag_callback), NULL);
+            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);
 
             // Check for URLs in the initial string passed to Create
             gtk_text_buffer_get_start_iter(m_buffer, &start);


@@ -807,261 +779,312 @@ bool wxTextCtrl::Create( wxWindow *parent,
             au_check_range(&start, &end);
         }
     }
             au_check_range(&start, &end);
         }
     }

-    else
-#endif
-
+    else // single line

     {
     {

-        gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-            GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+        // do the right thing with Enter presses depending on whether we have
+        // wxTE_PROCESS_ENTER or not
+        GTKSetActivatesDefault();

     }
 
     }
 

-    m_cursor = wxCursor( wxCURSOR_IBEAM );

 
 

-    wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont());
-    SetDefaultStyle( attrDef );
+    g_signal_connect (m_text, "copy-clipboard",
+                      G_CALLBACK (gtk_copy_clipboard_callback), this);
+    g_signal_connect (m_text, "cut-clipboard",
+                      G_CALLBACK (gtk_cut_clipboard_callback), this);
+    g_signal_connect (m_text, "paste-clipboard",
+                      G_CALLBACK (gtk_paste_clipboard_callback), this);
+
+    m_cursor = wxCursor( wxCURSOR_IBEAM );

 
     return true;
 }
 
 
     return true;
 }
 

+GtkEditable *wxTextCtrl::GetEditable() const
+{
+    wxCHECK_MSG( IsSingleLine(), NULL, "shouldn't be called for multiline" );

 
 

-void wxTextCtrl::CalculateScrollbar()
+    return GTK_EDITABLE(m_text);
+}
+
+// ----------------------------------------------------------------------------
+// flags handling
+// ----------------------------------------------------------------------------
+
+void wxTextCtrl::GTKSetEditable()
+{
+    gboolean editable = !HasFlag(wxTE_READONLY);
+    if ( IsSingleLine() )
+        gtk_editable_set_editable(GTK_EDITABLE(m_text), editable);
+    else
+        gtk_text_view_set_editable(GTK_TEXT_VIEW(m_text), editable);
+}
+
+void wxTextCtrl::GTKSetVisibility()
+{
+    wxCHECK_RET( IsSingleLine(),
+                 "wxTE_PASSWORD is for single line text controls only" );
+
+    gtk_entry_set_visibility(GTK_ENTRY(m_text), !HasFlag(wxTE_PASSWORD));
+}
+
+void wxTextCtrl::GTKSetActivatesDefault()

 {
 {

-#ifndef __WXGTK20__
-    if ((m_windowStyle & wxTE_MULTILINE) == 0) return;
+    wxCHECK_RET( IsSingleLine(),
+                 "wxTE_PROCESS_ENTER is for single line text controls only" );
+
+    gtk_entry_set_activates_default(GTK_ENTRY(m_text),
+                                    !HasFlag(wxTE_PROCESS_ENTER));
+}
+
+void wxTextCtrl::GTKSetWrapMode()
+{
+    // no wrapping in single line controls
+    if ( !IsMultiLine() )
+        return;

 
 

-    GtkAdjustment *adj = GTK_TEXT(m_text)->vadj;
+    // translate wx wrapping style to GTK+
+    GtkWrapMode wrap;
+    if ( HasFlag( wxTE_DONTWRAP ) )
+        wrap = GTK_WRAP_NONE;
+    else if ( HasFlag( wxTE_CHARWRAP ) )
+        wrap = GTK_WRAP_CHAR;
+    else if ( HasFlag( wxTE_WORDWRAP ) )
+        wrap = GTK_WRAP_WORD;
+    else // HasFlag(wxTE_BESTWRAP) always true as wxTE_BESTWRAP == 0
+        wrap = GTK_WRAP_WORD_CHAR;

 
 

-    if (adj->upper - adj->page_size < 0.8)
+    gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );
+}
+
+void wxTextCtrl::GTKSetJustification()
+{
+    if ( IsMultiLine() )

     {
     {

-        if (m_vScrollbarVisible)
-        {
-            gtk_widget_hide( m_vScrollbar );
-            m_vScrollbarVisible = false;
-        }
+        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
+    else // single line

     {
     {

-        if (!m_vScrollbarVisible)
-        {
-            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

 }
 
 }
 

+void wxTextCtrl::SetWindowStyleFlag(long style)
+{
+    long styleOld = GetWindowStyleFlag();
+
+    wxTextCtrlBase::SetWindowStyleFlag(style);
+
+    if ( (style & wxTE_READONLY) != (styleOld & wxTE_READONLY) )
+        GTKSetEditable();
+
+    if ( (style & wxTE_PASSWORD) != (styleOld & wxTE_PASSWORD) )
+        GTKSetVisibility();
+
+    if ( (style & wxTE_PROCESS_ENTER) != (styleOld & wxTE_PROCESS_ENTER) )
+        GTKSetActivatesDefault();
+
+    static const long flagsWrap = wxTE_WORDWRAP | wxTE_CHARWRAP | wxTE_DONTWRAP;
+    if ( (style & flagsWrap) != (styleOld & flagsWrap) )
+        GTKSetWrapMode();
+
+    static const long flagsAlign = wxTE_LEFT | wxTE_CENTRE | wxTE_RIGHT;
+    if ( (style & flagsAlign) != (styleOld & flagsAlign) )
+        GTKSetJustification();
+}
+
+// ----------------------------------------------------------------------------
+// control value
+// ----------------------------------------------------------------------------
+

 wxString wxTextCtrl::GetValue() const
 {
 wxString wxTextCtrl::GetValue() const
 {

-    wxCHECK_MSG( m_text != NULL, wxT(""), wxT("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );

 
 

-    wxString tmp;
-    if (m_windowStyle & wxTE_MULTILINE)
+    if ( IsMultiLine() )

     {
     {

-#ifdef __WXGTK20__

         GtkTextIter start;
         gtk_text_buffer_get_start_iter( m_buffer, &start );
         GtkTextIter end;
         gtk_text_buffer_get_end_iter( m_buffer, &end );
         GtkTextIter start;
         gtk_text_buffer_get_start_iter( m_buffer, &start );
         GtkTextIter end;
         gtk_text_buffer_get_end_iter( m_buffer, &end );

-        gchar *text = gtk_text_buffer_get_text( m_buffer, &start, &end, TRUE );
+        wxGtkString text(gtk_text_buffer_get_text(m_buffer, &start, &end, true));

 
 

-#if wxUSE_UNICODE
-        wxWCharBuffer buffer( wxConvUTF8.cMB2WX( text ) );
-#else
-        wxCharBuffer buffer( wxConvLocal.cWC2WX( wxConvUTF8.cMB2WC( text ) ) );
-#endif
-        if ( buffer )
-            tmp = buffer;
-
-        g_free( text );
-#else
-        gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-        char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
-        tmp = text;
-        g_free( text );
-#endif
+        return wxGTK_CONV_BACK(text);

     }
     }

-    else
+    else // single line

     {
     {

-        tmp = wxGTK_CONV_BACK( gtk_entry_get_text( GTK_ENTRY(m_text) ) );
+        return wxTextEntry::GetValue();

     }
     }

+}
+
+wxFontEncoding wxTextCtrl::GetTextEncoding() const
+{
+    // GTK+ uses UTF-8 internally, we need to convert to it but from which
+    // encoding?

 
 

-    return tmp;
+    // first check the default text style (we intentionally don't check the
+    // style for the current position as it doesn't make sense for SetValue())
+    const wxTextAttr& style = GetDefaultStyle();
+    wxFontEncoding enc = style.HasFontEncoding() ? style.GetFontEncoding()
+                                         : wxFONTENCODING_SYSTEM;
+
+    // fall back to the controls font if no style
+    if ( enc == wxFONTENCODING_SYSTEM && m_hasFont )
+        enc = GetFont().GetEncoding();
+
+    return enc;

 }
 
 }
 

-void wxTextCtrl::SetValue( const wxString &value )
+bool wxTextCtrl::IsEmpty() const
+{
+    if ( IsMultiLine() )
+        return gtk_text_buffer_get_char_count(m_buffer) == 0;
+
+    return wxTextEntry::IsEmpty();
+}
+
+void wxTextCtrl::DoSetValue( const wxString &value, int flags )

 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-    if (m_windowStyle & wxTE_MULTILINE)
+    m_modified = false;
+
+    if ( !IsMultiLine() )

     {
     {

-#ifdef __WXGTK20__
+        wxTextEntry::DoSetValue(value, flags);
+        return;
+    }

 
 

-#if wxUSE_UNICODE
-        wxCharBuffer buffer( wxConvUTF8.cWX2MB( value) );
-#else
-        wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) );
-#endif
-        if (gtk_text_buffer_get_char_count(m_buffer) != 0)
-            IgnoreNextTextUpdate();
+    wxFontEncoding enc = m_defaultStyle.HasFont()
+                            ? m_defaultStyle.GetFont().GetEncoding()
+                            : wxFONTENCODING_SYSTEM;
+    if ( enc == wxFONTENCODING_SYSTEM )
+        enc = GetTextEncoding();

 
 

-        gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
+    const wxCharBuffer buffer(wxGTK_CONV_ENC(value, enc));
+    if ( !buffer )
+    {
+        // see comment in WriteText() as to why we must warn the user about
+        // this
+        wxLogWarning(_("Failed to set text in the text control."));
+        return;
+    }

 
 

-#else
-        gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-        gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len );
-        len = 0;
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.Length(), &len );
-#endif
+    if ( !(flags & SetValue_SendEvent) )
+    {
+        EnableTextChangedEvents(false);

     }
     }

-    else
+
+    gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
+
+    if ( !m_defaultStyle.IsDefault() )

     {
     {

-        gtk_entry_set_text( GTK_ENTRY(m_text), wxGTK_CONV( value ) );
+        GtkTextIter start, end;
+        gtk_text_buffer_get_bounds( m_buffer, &start, &end );
+        wxGtkTextApplyTagsFromAttr(m_widget, m_buffer, m_defaultStyle,
+                                   &start, &end);

     }
 
     }
 

-    // 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);
+    if ( !(flags & SetValue_SendEvent) )
+    {
+        EnableTextChangedEvents(true);
+    }

 
 

-    m_modified = false;
+    // This was added after discussion on the list
+    SetInsertionPoint(0);

 }
 
 void wxTextCtrl::WriteText( const wxString &text )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 }
 
 void wxTextCtrl::WriteText( const wxString &text )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-    if ( text.empty() )
-        return;
-
-    // gtk_text_changed_callback() will set m_modified to true but m_modified
-    // shouldn't be changed by the program writing to the text control itself,
-    // so save the old value and restore when we're done
-    bool oldModified = m_modified;
-
-    if ( m_windowStyle & wxTE_MULTILINE )
-    {
-#ifdef __WXGTK20__
-
-#if wxUSE_UNICODE
-        wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
-#else
-        wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
-#endif
-        if ( !buffer )
-        {
-            // what else can we do? at least don't crash...
-            return;
-        }
-
-        // TODO: Call whatever is needed to delete the selection.
-        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
-        if ( 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 // GTK 1.x
-        // After cursor movements, gtk_text_get_point() is wrong by one.
-        gtk_text_set_point( GTK_TEXT(m_text), GET_EDITABLE_POS(m_text) );
-
-        // always use m_defaultStyle, even if it is empty as otherwise
-        // resetting the style and appending some more text wouldn't work: if
-        // we don't specify the style explicitly, the old style would be used
-        gtk_editable_delete_selection( GTK_EDITABLE(m_text) );
-        wxGtkTextInsert(m_text, m_defaultStyle, text.c_str(), text.Len());
-
-        // we called wxGtkTextInsert with correct font, no need to do anything
-        // in UpdateFontIfNeeded() any longer
-        if ( !text.empty() )
-        {
-            SetUpdateFont(false);
-        }
+    // we're changing the text programmatically
+    DontMarkDirtyOnNextChange();

 
 

-        // Bring editable's cursor back uptodate.
-        SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
-#endif // GTK 1.x/2.0
+    if ( !IsMultiLine() )
+    {
+        wxTextEntry::WriteText(text);
+        return;

     }
     }

-    else // single line
+
+    // check if we have a specific style for the current position
+    wxFontEncoding enc = wxFONTENCODING_SYSTEM;
+    wxTextAttr style;
+    if ( GetStyle(GetInsertionPoint(), style) && style.HasFontEncoding() )

     {
     {

-        // First remove the selection if there is one
-        gtk_editable_delete_selection( GTK_EDITABLE(m_text) );
+        enc = style.GetFontEncoding();
+    }

 
 

-        // This moves the cursor pos to behind the inserted text.
-        gint len = GET_EDITABLE_POS(m_text);
+    if ( enc == wxFONTENCODING_SYSTEM )
+        enc = GetTextEncoding();

 
 

-#ifdef __WXGTK20__
+    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;
+    }

 
 

-#if wxUSE_UNICODE
-        wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
-#else
-        wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
-#endif
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
+    // 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);

 
 

-#else
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), text.c_str(), text.Len(), &len );
-#endif
+    // Insert the text
+    wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );

 
 

-        // Bring entry's cursor uptodate.
-        gtk_entry_set_position( GTK_ENTRY(m_text), len );
+    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 );

     }
     }

-
-    m_modified = oldModified;
-}
-
-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)
+    wxString result;
+    if ( IsMultiLine() )

     {
     {

-#ifndef __WXGTK20__
-        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 buf(wxT(""));
-            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;
-        }
-        else
-        {
-            return wxEmptyString;
-        }
-#else

         GtkTextIter line;
         gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo);
         GtkTextIter line;
         gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo);

-        GtkTextIter end;
-        gtk_text_buffer_get_end_iter(m_buffer,&end );
-        gchar *text = gtk_text_buffer_get_text(m_buffer,&line,&end,TRUE);
-        wxString result(wxGTK_CONV_BACK(text));
-        g_free(text);
-        return result.BeforeFirst(wxT('\n'));
-#endif
+
+        GtkTextIter end = line;
+        // avoid skipping to the next line end if this one is empty
+        if ( !gtk_text_iter_ends_line(&line) )
+            gtk_text_iter_forward_to_line_end(&end);
+
+        wxGtkString text(gtk_text_buffer_get_text(m_buffer, &line, &end, true));
+        result = wxGTK_CONV_BACK(text);

     }
     else
     {
     }
     else
     {

-        if (lineNo == 0) return GetValue();
-        return wxEmptyString;
+        if (lineNo == 0)
+            result = GetValue();

     }
     }

+    return result;

 }
 
 void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
 }
 
 void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )


@@ -1073,35 +1096,28 @@ void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
 
 bool 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()  )
+        if (pos > GetLastPosition())

             return false;
 
             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 == wxT('\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
         {
         }
         else
         {


@@ -1115,51 +1131,47 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
 
 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;
+
+    GtkTextIter iter;
+    if (y >= gtk_text_buffer_get_line_count (m_buffer))
+        return -1;

 
 

-    long pos=0;
-    for( int i=0; i<y; i++ ) pos += GetLineLength(i) + 1; // one for '\n'
+    gtk_text_buffer_get_iter_at_line(m_buffer, &iter, y);
+    if (x >= gtk_text_iter_get_chars_in_line (&iter))
+        return -1;

 
 

-    pos += x;
-    return pos;
+    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() )

     {
     {

-#ifdef __WXGTK20__

         return gtk_text_buffer_get_line_count( m_buffer );
         return gtk_text_buffer_get_line_count( m_buffer );

-#else
-        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;
-        }
-#endif

     }
     }

-    else
+    else // single line

     {
         return 1;
     }
     {
         return 1;
     }


@@ -1171,60 +1183,19 @@ void wxTextCtrl::SetInsertionPoint( long pos )
 
     if ( IsMultiLine() )
     {
 
     if ( IsMultiLine() )
     {

-#ifdef __WXGTK20__

         GtkTextIter iter;
         gtk_text_buffer_get_iter_at_offset( m_buffer, &iter, pos );
         gtk_text_buffer_place_cursor( m_buffer, &iter );
         GtkTextIter iter;
         gtk_text_buffer_get_iter_at_offset( m_buffer, &iter, pos );
         gtk_text_buffer_place_cursor( m_buffer, &iter );

-        gtk_text_view_scroll_mark_onscreen
-        (
-            GTK_TEXT_VIEW(m_text),
-            gtk_text_buffer_get_insert( m_buffer )
-        );
-#else // GTK+ 1.x
-        gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-
-        /* we fake a set_point by inserting and deleting. as the user
-           isn't supposed to get to know about this non-sense, we
-           disconnect so that no events are sent to the user program. */
-
-        gint tmp = (gint)pos;
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), " ", 1, &tmp );
-        gtk_editable_delete_text( GTK_EDITABLE(m_text), tmp-1, tmp );
-
-        gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-
-        // bring editable's cursor uptodate. Bug in GTK.
-        SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
-#endif // GTK+ 2/1
-    }
-    else
-    {
-        gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
-
-        // Bring editable's cursor uptodate. Bug in GTK.
-        SET_EDITABLE_POS(m_text, (guint32)pos);
-    }
-}
-
-void wxTextCtrl::SetInsertionPointEnd()
-{
-    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-
-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-#ifdef __WXGTK20__
-        GtkTextIter end;
-        gtk_text_buffer_get_end_iter( m_buffer, &end );
-        gtk_text_buffer_place_cursor( m_buffer, &end );
-#else
-        SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text)));
-#endif
+        GtkTextMark* mark = gtk_text_buffer_get_insert(m_buffer);
+        if (IsFrozen())
+            // defer until Thaw, text view is not using m_buffer now
+            m_showPositionOnThaw = mark;
+        else
+            gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(m_text), mark);

     }
     }

-    else
+    else // single line

     {
     {

-        gtk_entry_set_position( GTK_ENTRY(m_text), -1 );
+        wxTextEntry::SetInsertionPoint(pos);

     }
 }
 
     }
 }
 


@@ -1232,17 +1203,13 @@ void wxTextCtrl::SetEditable( bool editable )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-    if (m_windowStyle & wxTE_MULTILINE)
+    if ( IsMultiLine() )

     {
     {

-#ifdef __WXGTK20__

         gtk_text_view_set_editable( GTK_TEXT_VIEW(m_text), editable );
         gtk_text_view_set_editable( GTK_TEXT_VIEW(m_text), editable );

-#else
-        gtk_text_set_editable( GTK_TEXT(m_text), editable );
-#endif

     }
     }

-    else
+    else // single line

     {
     {

-        gtk_entry_set_editable( GTK_ENTRY(m_text), editable );
+        wxTextEntry::SetEditable(editable);

     }
 }
 
     }
 }
 


@@ -1254,27 +1221,15 @@ bool wxTextCtrl::Enable( bool enable )
         return false;
     }
 
         return false;
     }
 

-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-#ifdef __WXGTK20__
-        SetEditable( enable );
-#else
-        gtk_text_set_editable( GTK_TEXT(m_text), enable );
-        OnParentEnable(enable);
-#endif
-    }
-    else
-    {
-        gtk_widget_set_sensitive( m_text, enable );
-    }
+    gtk_widget_set_sensitive( m_text, enable );

 
     return true;
 }
 
 // wxGTK-specific: called recursively by Enable,
 
     return true;
 }
 
 // wxGTK-specific: called recursively by Enable,

-// to give widgets an oppprtunity to correct their colours after they
+// to give widgets an opportunity to correct their colours after they

 // have been changed by Enable
 // have been changed by Enable

-void wxTextCtrl::OnParentEnable( bool enable )
+void wxTextCtrl::OnEnabled(bool WXUNUSED(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
 {
     // 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


@@ -1302,19 +1257,28 @@ void wxTextCtrl::DiscardEdits()
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// max text length support
+// event handling

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxTextCtrl::IgnoreNextTextUpdate()
+void wxTextCtrl::EnableTextChangedEvents(bool enable)

 {
 {

-    m_ignoreNextUpdate = true;
+    if ( enable )
+    {
+        g_signal_handlers_unblock_by_func(GetTextObject(),
+            (gpointer)gtk_text_changed_callback, this);
+    }
+    else // disable events
+    {
+        g_signal_handlers_block_by_func(GetTextObject(),
+            (gpointer)gtk_text_changed_callback, this);
+    }

 }
 
 bool wxTextCtrl::IgnoreTextUpdate()
 {
 }
 
 bool wxTextCtrl::IgnoreTextUpdate()
 {

-    if ( m_ignoreNextUpdate )
+    if ( m_countUpdatesToIgnore > 0 )

     {
     {

-        m_ignoreNextUpdate = false;
+        m_countUpdatesToIgnore--;

 
         return true;
     }
 
         return true;
     }


@@ -1322,38 +1286,16 @@ bool wxTextCtrl::IgnoreTextUpdate()
     return false;
 }
 
     return false;
 }
 

-void wxTextCtrl::SetMaxLength(unsigned long len)
+bool wxTextCtrl::MarkDirtyOnChange()

 {
 {

-    if ( !HasFlag(wxTE_MULTILINE) )
+    if ( m_dontMarkDirty )

     {
     {

-        gtk_entry_set_max_length(GTK_ENTRY(m_text), len);
+        m_dontMarkDirty = false;

 
 

-        // 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 )
-        {
-            gtk_signal_connect( GTK_OBJECT(m_text),
-                                "insert_text",
-                                GTK_SIGNAL_FUNC(gtk_insert_text_callback),
-                                (gpointer)this);
-        }
-        else // no checking
-        {
-            gtk_signal_disconnect_by_func
-            (
-                GTK_OBJECT(m_text),
-                GTK_SIGNAL_FUNC(gtk_insert_text_callback),
-                (gpointer)this
-            );
-        }
+        return false;

     }
     }

+
+    return true;

 }
 
 void wxTextCtrl::SetSelection( long from, long to )
 }
 
 void wxTextCtrl::SetSelection( long from, long to )


@@ -1363,63 +1305,40 @@ void wxTextCtrl::SetSelection( long from, long to )
     if (from == -1 && to == -1)
     {
         from = 0;
     if (from == -1 && to == -1)
     {
         from = 0;

-        to = GetValue().Length();
-    }
-
-#ifndef __WXGTK20__
-    if ( (m_windowStyle & wxTE_MULTILINE) &&
-         !GTK_TEXT(m_text)->line_start_cache )
-    {
-        // tell the programmer that it didn't work
-        wxLogDebug(_T("Can't call SetSelection() before realizing the control"));
-        return;
+        to = GetValue().length();

     }
     }

-#endif

 
 

-    if (m_windowStyle & wxTE_MULTILINE)
+    if ( IsMultiLine() )

     {
     {

-#ifdef __WXGTK20__

         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_place_cursor( m_buffer, &toi );
         gtk_text_buffer_move_mark_by_name( m_buffer, "selection_bound", &fromi );
         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_place_cursor( m_buffer, &toi );
         gtk_text_buffer_move_mark_by_name( m_buffer, "selection_bound", &fromi );

-#else
-        gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
-#endif

     }
     }

-    else
+    else // single line

     {
     {

-        gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+        wxTextEntry::SetSelection(from, to);

     }
 }
 
 void wxTextCtrl::ShowPosition( long pos )
 {
     }
 }
 
 void wxTextCtrl::ShowPosition( long pos )
 {

-    if (m_windowStyle & wxTE_MULTILINE)
+    if (IsMultiLine())

     {
     {

-#ifdef __WXGTK20__

         GtkTextIter iter;
         GtkTextIter iter;

-        gtk_text_buffer_get_start_iter( m_buffer, &iter );
-        gtk_text_iter_set_offset( &iter, pos );
-        GtkTextMark *mark = gtk_text_buffer_create_mark( m_buffer, NULL, &iter, TRUE );
-        gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text), mark, 0.0, FALSE, 0.0, 0.0 );
-#else // GTK 1.x
-        GtkAdjustment *vp = GTK_TEXT(m_text)->vadj;
-        float totalLines =  (float) GetNumberOfLines();
-        long posX;
-        long posY;
-        PositionToXY(pos, &posX, &posY);
-        float posLine = (float) posY;
-        float p = (posLine/totalLines)*(vp->upper - vp->lower) + vp->lower;
-        gtk_adjustment_set_value(GTK_TEXT(m_text)->vadj, p);
-#endif // GTK 1.x/2.x
+        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);

     }
 }
 
     }
 }
 

-#ifdef __WXGTK20__
-

 wxTextCtrlHitTestResult
 wxTextCtrl::HitTest(const wxPoint& pt, long *pos) const
 {
 wxTextCtrlHitTestResult
 wxTextCtrl::HitTest(const wxPoint& pt, long *pos) const
 {


@@ -1446,14 +1365,11 @@ wxTextCtrl::HitTest(const wxPoint& pt, long *pos) const
     return wxTE_HT_ON_TEXT;
 }
 
     return wxTE_HT_ON_TEXT;
 }
 

-#endif // __WXGTK20__
-

 long wxTextCtrl::GetInsertionPoint() const
 {
     wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
 
 long wxTextCtrl::GetInsertionPoint() const
 {
     wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
 

-#ifdef __WXGTK20__
-    if (m_windowStyle & wxTE_MULTILINE)
+    if ( IsMultiLine() )

     {
         // There is no direct accessor for the cursor, but
         // internally, the cursor is the "mark" called
     {
         // There is no direct accessor for the cursor, but
         // internally, the cursor is the "mark" called


@@ -1466,9 +1382,8 @@ long wxTextCtrl::GetInsertionPoint() const
         return gtk_text_iter_get_offset( &cursor );
     }
     else
         return gtk_text_iter_get_offset( &cursor );
     }
     else

-#endif

     {
     {

-    return (long) GET_EDITABLE_POS(m_text);
+        return wxTextEntry::GetInsertionPoint();

     }
 }
 
     }
 }
 


@@ -1478,20 +1393,16 @@ wxTextPos wxTextCtrl::GetLastPosition() const
 
     int pos = 0;
 
 
     int pos = 0;
 

-    if (m_windowStyle & wxTE_MULTILINE)
+    if ( IsMultiLine() )

     {
     {

-#ifdef __WXGTK20__

         GtkTextIter end;
         gtk_text_buffer_get_end_iter( m_buffer, &end );
 
         pos = gtk_text_iter_get_offset( &end );
         GtkTextIter end;
         gtk_text_buffer_get_end_iter( m_buffer, &end );
 
         pos = gtk_text_iter_get_offset( &end );

-#else
-        pos = gtk_text_get_length( GTK_TEXT(m_text) );
-#endif

     }
     }

-    else
+    else // single line

     {
     {

-        pos = GTK_ENTRY(m_text)->text_length;
+        pos = wxTextEntry::GetLastPosition();

     }
 
     return (long)pos;
     }
 
     return (long)pos;


@@ -1501,8 +1412,7 @@ void wxTextCtrl::Remove( long from, long to )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-#ifdef __WXGTK20__
-    if (m_windowStyle & wxTE_MULTILINE)
+    if ( IsMultiLine() )

     {
         GtkTextIter fromi, toi;
         gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from );
     {
         GtkTextIter fromi, toi;
         gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from );


@@ -1511,30 +1421,8 @@ void wxTextCtrl::Remove( long from, long to )
         gtk_text_buffer_delete( m_buffer, &fromi, &toi );
     }
     else // single line
         gtk_text_buffer_delete( m_buffer, &fromi, &toi );
     }
     else // single line

-#endif
-    gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
-}
-
-void wxTextCtrl::Replace( long from, long to, const wxString &value )
-{
-    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-
-    Remove( from, to );
-
-    if (!value.empty())

     {
     {

-#ifdef __WXGTK20__
-        SetInsertionPoint( from );
-        WriteText( value );
-#else // GTK 1.x
-        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 // wxUSE_UNICODE
-#endif // GTK 1.x/2.x
+        wxTextEntry::Remove(from, to);

     }
 }
 
     }
 }
 


@@ -1542,63 +1430,30 @@ void wxTextCtrl::Cut()
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-#ifdef __WXGTK20__
-    if (m_windowStyle & wxTE_MULTILINE)
-        g_signal_emit_by_name(m_text, "cut-clipboard");
+    if ( IsMultiLine() )
+        g_signal_emit_by_name (m_text, "cut-clipboard");

     else
     else

-#endif
-        gtk_editable_cut_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
+        wxTextEntry::Cut();

 }
 
 void wxTextCtrl::Copy()
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 }
 
 void wxTextCtrl::Copy()
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-#ifdef __WXGTK20__
-    if (m_windowStyle & wxTE_MULTILINE)
-        g_signal_emit_by_name(m_text, "copy-clipboard");
+    if ( IsMultiLine() )
+        g_signal_emit_by_name (m_text, "copy-clipboard");

     else
     else

-#endif
-        gtk_editable_copy_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
+        wxTextEntry::Copy();

 }
 
 void wxTextCtrl::Paste()
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 }
 
 void wxTextCtrl::Paste()
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-#ifdef __WXGTK20__
-    if (m_windowStyle & wxTE_MULTILINE)
-        g_signal_emit_by_name(m_text, "paste-clipboard");
+    if ( IsMultiLine() )
+        g_signal_emit_by_name (m_text, "paste-clipboard");

     else
     else

-#endif
-        gtk_editable_paste_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
-}
-
-// Undo/redo
-void wxTextCtrl::Undo()
-{
-    // TODO
-    wxFAIL_MSG( wxT("wxTextCtrl::Undo not implemented") );
-}
-
-void wxTextCtrl::Redo()
-{
-    // TODO
-    wxFAIL_MSG( wxT("wxTextCtrl::Redo not implemented") );
-}
-
-bool wxTextCtrl::CanUndo() const
-{
-    // TODO
-    //wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
-    return false;
-}
-
-bool wxTextCtrl::CanRedo() const
-{
-    // TODO
-    //wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
-    return false;
+        wxTextEntry::Paste();

 }
 
 // If the return values from and to are the same, there is no
 }
 
 // If the return values from and to are the same, there is no


@@ -1607,48 +1462,33 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-    gint from = -1;
-    gint to = -1;
-    bool haveSelection = false;
-
-#ifdef __WXGTK20__
-     if (m_windowStyle & wxTE_MULTILINE)
-     {
-         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;
-         }
-     }
-#else //  not GTK2
-     if ( (GTK_EDITABLE(m_text)->has_selection) )
-     {
-         haveSelection = true;
-         from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
-         to = (long) GTK_EDITABLE(m_text)->selection_end_pos;
-     }
-#endif
+    if ( !IsMultiLine() )
+    {
+        wxTextEntry::GetSelection(fromOut, toOut);
+        return;
+    }
+
+    gint from, to;

 
 

-     if (! haveSelection )
-          from = to = GetInsertionPoint();
+    GtkTextIter ifrom, ito;
+    if ( gtk_text_buffer_get_selection_bounds(m_buffer, &ifrom, &ito) )
+    {
+        from = gtk_text_iter_get_offset(&ifrom);
+        to = gtk_text_iter_get_offset(&ito);

 
 

-     if ( from > to )
-     {
-         // exchange them to be compatible with wxMSW
-         gint tmp = from;
-         from = to;
-         to = tmp;
-     }
+        if ( from > to )
+        {
+            // exchange them to be compatible with wxMSW
+            gint tmp = from;
+            from = to;
+            to = tmp;
+        }
+    }
+    else // no selection
+    {
+        from =
+        to = GetInsertionPoint();
+    }

 
     if ( fromOut )
         *fromOut = from;
 
     if ( fromOut )
         *fromOut = from;


@@ -1661,18 +1501,14 @@ bool wxTextCtrl::IsEditable() const
 {
     wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
 
 {
     wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
 

-#ifdef __WXGTK20__
-    if (m_windowStyle & wxTE_MULTILINE)
+    if ( IsMultiLine() )

     {
         return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text));
     }
     else
     {
     {
         return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text));
     }
     else
     {

-        return gtk_editable_get_editable(GTK_EDITABLE(m_text));
+        return wxTextEntry::IsEditable();

     }
     }

-#else
-    return GTK_EDITABLE(m_text)->editable;
-#endif

 }
 
 bool wxTextCtrl::IsModified() const
 }
 
 bool wxTextCtrl::IsModified() const


@@ -1680,41 +1516,19 @@ bool wxTextCtrl::IsModified() const
     return m_modified;
 }
 
     return m_modified;
 }
 

-void wxTextCtrl::Clear()
-{
-    SetValue( wxT("") );
-}
-

 void wxTextCtrl::OnChar( wxKeyEvent &key_event )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 void wxTextCtrl::OnChar( wxKeyEvent &key_event )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-    if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
-    {
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
-        event.SetEventObject(this);
-        event.SetString(GetValue());
-        if (GetEventHandler()->ProcessEvent(event)) return;
-    }
-
-    if ((key_event.GetKeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE))
+    if ( key_event.GetKeyCode() == WXK_RETURN )

     {
     {

-        // This will invoke the dialog default action, such
-        // as the clicking the default button.
-
-        wxWindow *top_frame = m_parent;
-        while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
-            top_frame = top_frame->GetParent();
-
-        if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))
+        if ( HasFlag(wxTE_PROCESS_ENTER) )

         {
         {

-            GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
-
-            if (window->default_widget)
-            {
-                gtk_widget_activate (window->default_widget);
+            wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+            event.SetEventObject(this);
+            event.SetString(GetValue());
+            if ( HandleWindowEvent(event) )

                 return;
                 return;

-            }

         }
     }
 
         }
     }
 


@@ -1726,19 +1540,16 @@ 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)
+    if ( IsMultiLine() )

     {
     {

-#ifdef __WXGTK20__
-        return window == gtk_text_view_get_window( GTK_TEXT_VIEW( m_text ), GTK_TEXT_WINDOW_TEXT );  // pure guesswork
-#else
-        return (window == GTK_TEXT(m_text)->text_area);
-#endif
+        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;

     }
 }
 
     }
 }
 


@@ -1753,7 +1564,7 @@ bool wxTextCtrl::SetFont( const wxFont &font )
         return false;
     }
 
         return false;
     }
 

-    if ( m_windowStyle & wxTE_MULTILINE )
+    if ( IsMultiLine() )

     {
         SetUpdateFont(true);
 
     {
         SetUpdateFont(true);
 


@@ -1771,14 +1582,8 @@ void wxTextCtrl::ChangeFontGlobally()
     // possible!
     //
     // TODO: it can be implemented much more efficiently for GTK2
     // possible!
     //
     // TODO: it can be implemented much more efficiently for GTK2

-#ifndef __WXGTK20__
-    wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont,
-
-                  _T("shouldn't be called for single line controls") );
-#else
-    wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE),
+    wxASSERT_MSG( IsMultiLine(),

                   _T("shouldn't be called for single line controls") );
                   _T("shouldn't be called for single line controls") );

-#endif

 
     wxString value = GetValue();
     if ( !value.empty() )
 
     wxString value = GetValue();
     if ( !value.empty() )


@@ -1790,16 +1595,6 @@ void wxTextCtrl::ChangeFontGlobally()
     }
 }
 
     }
 }
 

-#ifndef __WXGTK20__
-
-void wxTextCtrl::UpdateFontIfNeeded()
-{
-    if ( m_updateFont )
-        ChangeFontGlobally();
-}
-
-#endif // GTK+ 1.x
-

 bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
 {
     if ( !wxControl::SetForegroundColour(colour) )
 bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
 {
     if ( !wxControl::SetForegroundColour(colour) )


@@ -1818,26 +1613,9 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
     if ( !wxControl::SetBackgroundColour( colour ) )
         return false;
 
     if ( !wxControl::SetBackgroundColour( colour ) )
         return false;
 

-#ifndef __WXGTK20__
-    if (!m_widget->window)
-        return false;
-#endif
-

     if (!m_backgroundColour.Ok())
         return false;
 
     if (!m_backgroundColour.Ok())
         return false;
 

-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-#ifndef __WXGTK20__
-        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 );
-#endif
-    }
-

     // change active background color too
     m_defaultStyle.SetBackgroundColour( colour );
 
     // change active background color too
     m_defaultStyle.SetBackgroundColour( colour );
 


@@ -1846,14 +1624,14 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 
 bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
 {
 
 bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
 {

-    if ( m_windowStyle & wxTE_MULTILINE )
+    if ( IsMultiLine() )

     {
         if ( style.IsDefault() )
         {
             // nothing to do
             return true;
         }
     {
         if ( style.IsDefault() )
         {
             // nothing to do
             return true;
         }

-#ifdef __WXGTK20__
+

         gint l = gtk_text_buffer_get_char_count( m_buffer );
 
         wxCHECK_MSG( start >= 0 && end <= l, false,
         gint l = gtk_text_buffer_get_char_count( m_buffer );
 
         wxCHECK_MSG( start >= 0 && end <= l, false,


@@ -1863,59 +1641,13 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
         gtk_text_buffer_get_iter_at_offset( m_buffer, &starti, start );
         gtk_text_buffer_get_iter_at_offset( m_buffer, &endi, end );
 
         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_buffer, attr, &starti, &endi );
-
-        return true;
-#else
-        // VERY dirty way to do that - removes the required text and re-adds it
-        // with styling (FIXME)
-
-        gint l = gtk_text_get_length( GTK_TEXT(m_text) );
-
-        wxCHECK_MSG( start >= 0 && end <= l, false,
-                     _T("invalid range in wxTextCtrl::SetStyle") );
-
-        gint old_pos = gtk_editable_get_position( GTK_EDITABLE(m_text) );
-        char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), start, end );
-        wxString tmp(text,*wxConvCurrent);
-        g_free( text );
-
-        gtk_editable_delete_text( GTK_EDITABLE(m_text), start, end );
-        gtk_editable_set_position( GTK_EDITABLE(m_text), start );
-
-#if wxUSE_UNICODE
-        wxWX2MBbuf buf = tmp.mbc_str();
-        const char *txt = buf;
-        size_t txtlen = strlen(buf);
-#else
-        const char *txt = tmp;
-        size_t txtlen = tmp.length();
-#endif
+        wxGtkTextApplyTagsFromAttr( m_widget, m_buffer, style, &starti, &endi );

 
 

-        // 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
-        wxGtkTextInsert(m_text,
-                        wxTextAttr::Combine(style, m_defaultStyle, this),
-                        txt,
-                        txtlen);
-
-        /* does not seem to help under GTK+ 1.2 !!!
-        gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */
-        SetInsertionPoint( old_pos );
-#endif

         return true;
     }
         return true;
     }

-    else // singe line
-    {
-        // cannot do this for GTK+'s Entry widget
-        return false;
-    }
+    //else: single line text controls don't support styles
+
+    return false;

 }
 
 void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
 }
 
 void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style)


@@ -1973,45 +1705,6 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
     event.Enable( CanRedo() );
 }
 
     event.Enable( CanRedo() );
 }
 

-void wxTextCtrl::OnInternalIdle()
-{
-    wxCursor cursor = m_cursor;
-    if (g_globalCursor.Ok()) cursor = g_globalCursor;
-
-    if (cursor.Ok())
-    {
-#ifndef __WXGTK20__
-        GdkWindow *window = (GdkWindow*) NULL;
-        if (HasFlag(wxTE_MULTILINE))
-            window = GTK_TEXT(m_text)->text_area;
-        else
-            window = GTK_ENTRY(m_text)->text_area;
-
-        if (window)
-            gdk_window_set_cursor( window, cursor.GetCursor() );
-
-        if (!g_globalCursor.Ok())
-            cursor = *wxSTANDARD_CURSOR;
-
-        window = m_widget->window;
-        if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget)))
-            gdk_window_set_cursor( window, cursor.GetCursor() );
-#endif
-    }
-
-    if (g_delayedFocus == this)
-    {
-        if (GTK_WIDGET_REALIZED(m_widget))
-        {
-            gtk_widget_grab_focus( m_widget );
-            g_delayedFocus = NULL;
-        }
-    }
-
-    if (wxUpdateUIEvent::CanUpdate(this))
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
-

 wxSize wxTextCtrl::DoGetBestSize() const
 {
     // FIXME should be different for multi-line controls...
 wxSize wxTextCtrl::DoGetBestSize() const
 {
     // FIXME should be different for multi-line controls...


@@ -2025,49 +1718,51 @@ wxSize wxTextCtrl::DoGetBestSize() const
 // freeze/thaw
 // ----------------------------------------------------------------------------
 
 // freeze/thaw
 // ----------------------------------------------------------------------------
 

-void wxTextCtrl::Freeze()
+void wxTextCtrl::DoFreeze()

 {
 {

+    wxCHECK_RET(m_text != NULL, wxT("invalid text ctrl"));
+

     if ( HasFlag(wxTE_MULTILINE) )
     {
     if ( HasFlag(wxTE_MULTILINE) )
     {

-#ifdef __WXGTK20__
-        if ( !m_frozenness++ )
-        {
-            // freeze textview updates and remove buffer
-            g_signal_connect( G_OBJECT(m_text), "expose_event",
-                GTK_SIGNAL_FUNC(gtk_text_exposed_callback), (gpointer)this);
-            g_signal_connect( G_OBJECT(m_widget), "expose_event",
-                GTK_SIGNAL_FUNC(gtk_text_exposed_callback), (gpointer)this);
-            gtk_widget_set_sensitive(m_widget, false);
-            g_object_ref(m_buffer);
-            gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), gtk_text_buffer_new(NULL));
-    }
-#else
-        gtk_text_freeze(GTK_TEXT(m_text));
-#endif
-    }
-}
-
-void wxTextCtrl::Thaw()
+        // 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::DoThaw()

 {
     if ( HasFlag(wxTE_MULTILINE) )
     {
 {
     if ( HasFlag(wxTE_MULTILINE) )
     {

-#ifdef __WXGTK20__
-        wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") );
-
-        if ( !--m_frozenness )
+        // 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)

         {
         {

-            // 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);
+            gtk_text_view_scroll_mark_onscreen(
+                GTK_TEXT_VIEW(m_text), m_showPositionOnThaw);
+            m_showPositionOnThaw = NULL;

         }
         }

-#else
-        GTK_TEXT(m_text)->vadj->value = 0.0;
-
-        gtk_text_thaw(GTK_TEXT(m_text));
-#endif

     }
 }
 
     }
 }
 


@@ -2075,15 +1770,13 @@ void wxTextCtrl::Thaw()
 // wxTextUrlEvent passing if style & wxTE_AUTO_URL
 // ----------------------------------------------------------------------------
 
 // wxTextUrlEvent passing if style & wxTE_AUTO_URL
 // ----------------------------------------------------------------------------
 

-#ifdef __WXGTK20__
-

 // FIXME: when dragging on a link the sample gets an "Unknown event".
 // This might be an excessive event from us or a buggy wxMouseEvent::Moving() or
 // a buggy sample, or something else
 void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event)
 {
     event.Skip();
 // FIXME: when dragging on a link the sample gets an "Unknown event".
 // This might be an excessive event from us or a buggy wxMouseEvent::Moving() or
 // a buggy sample, or something else
 void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event)
 {
     event.Skip();

-    if(!(m_windowStyle & wxTE_AUTO_URL))
+    if( !HasFlag(wxTE_AUTO_URL) )

         return;
 
     gint x, y;
         return;
 
     gint x, y;


@@ -2122,85 +1815,27 @@ void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event)
 
     InitCommandEvent(url_event);
     // Is that a good idea? Seems not (pleasure with gtk_text_view_start_selection_drag)
 
     InitCommandEvent(url_event);
     // Is that a good idea? Seems not (pleasure with gtk_text_view_start_selection_drag)

-    //event.Skip(!GetEventHandler()->ProcessEvent(url_event));
-    GetEventHandler()->ProcessEvent(url_event);
-}
-#endif // gtk2
-
-// ----------------------------------------------------------------------------
-// scrolling
-// ----------------------------------------------------------------------------
-
-GtkAdjustment *wxTextCtrl::GetVAdj() const
-{
-    if ( !IsMultiLine() )
-        return NULL;
-
-#ifdef __WXGTK20__
-    return gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(m_widget));
-#else
-    return GTK_TEXT(m_text)->vadj;
-#endif
-}
-
-bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff)
-{
-    float value = adj->value + diff;
-
-    if ( value < 0 )
-        value = 0;
-
-    float upper = adj->upper - adj->page_size;
-    if ( value > upper )
-        value = upper;
-
-    // did we noticeably change the scroll position?
-    if ( fabs(adj->value - value) < 0.2 )
-    {
-        // well, this is what Robert does in wxScrollBar, so it must be good...
-        return false;
-    }
-
-    adj->value = value;
-
-#ifdef __WXGTK20__
-    gtk_adjustment_value_changed(GTK_ADJUSTMENT(adj));
-#else
-    gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed");
-#endif
-
-    return true;
-}
-
-bool wxTextCtrl::ScrollLines(int lines)
-{
-    GtkAdjustment *adj = GetVAdj();
-    if ( !adj )
-        return false;
-
-#ifdef __WXGTK20__
-    int diff = (int)ceil(lines*adj->step_increment);
-#else
-    // this is hardcoded to 10 in GTK+ 1.2 (great idea)
-    int diff = 10*lines;
-#endif
-
-    return DoScroll(adj, diff);
+    //event.Skip(!HandleWindowEvent(url_event));
+    HandleWindowEvent(url_event);

 }
 
 }
 

-bool wxTextCtrl::ScrollPages(int pages)
+bool wxTextCtrl::GTKProcessEvent(wxEvent& event) const

 {
 {

-    GtkAdjustment *adj = GetVAdj();
-    if ( !adj )
-        return false;
+    bool rc = wxTextCtrlBase::GTKProcessEvent(event);

 
 

-    return DoScroll(adj, (int)ceil(pages*adj->page_increment));
+    // 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);
 }
 // static
 wxVisualAttributes
 wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
     return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true);
 }

+
+#endif // wxUSE_TEXTCTRL