Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 112af870c3f6ddafe47e697b249cb1fdc83985bf..bce644abf474e58611ac79fe59d18dc5955363f5 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/textctrl.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        src/gtk/textctrl.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin, 2005 Mart Raudsepp
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin, 2005 Mart Raudsepp
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -10,30 +9,29 @@
 // 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/math.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/scopeguard.h"

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

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

-#include <gdk/gdkkeysyms.h>
-
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern wxCursor   g_globalCursor;
-extern wxWindowGTK *g_delayedFocus;
+#include "wx/gtk/private/gtk2-compat.h"

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


@@ -42,8 +40,8 @@ extern wxWindowGTK *g_delayedFocus;
 extern "C" {
 static void wxGtkOnRemoveTag(GtkTextBuffer *buffer,
                              GtkTextTag *tag,
 extern "C" {
 static void wxGtkOnRemoveTag(GtkTextBuffer *buffer,
                              GtkTextTag *tag,

-                             GtkTextIter *start,
-                             GtkTextIter *end,
+                             GtkTextIter * WXUNUSED(start),
+                             GtkTextIter * WXUNUSED(end),

                              char *prefix)
 {
     gchar *name;
                              char *prefix)
 {
     gchar *name;


@@ -57,8 +55,26 @@ static void wxGtkOnRemoveTag(GtkTextBuffer *buffer,
 }
 }
 
 }
 }
 

-extern "C" {
-static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
+// 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)


@@ -66,17 +82,15 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
     static gchar buf[1024];
     GtkTextTag *tag;
 
     static gchar buf[1024];
     GtkTextTag *tag;
 

-    gulong remove_handler_id = g_signal_connect (text_buffer, "remove_tag",
-            G_CALLBACK (wxGtkOnRemoveTag), gpointer("WX"));
-    gtk_text_buffer_remove_all_tags(text_buffer, start, end);
-    g_signal_handler_disconnect (text_buffer, remove_handler_id);
-

     if (attr.HasFont())
     {
     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)


@@ -84,9 +98,8 @@ 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 (attr.GetFont().GetUnderlined())
+        if (font.GetUnderlined())

         {
             g_snprintf(buf, sizeof(buf), "WXFONTUNDERLINE");
             tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
         {
             g_snprintf(buf, sizeof(buf), "WXFONTUNDERLINE");
             tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),


@@ -98,11 +111,25 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
                                                   NULL );
             gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
         }
                                                   NULL );
             gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
         }

+        if ( font.GetStrikethrough() )
+        {
+            g_snprintf(buf, sizeof(buf), "WXFONTSTRIKETHROUGH");
+            tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
+                                             buf );
+            if (!tag)
+                tag = gtk_text_buffer_create_tag( text_buffer, buf,
+                                                  "strikethrough-set", TRUE,
+                                                  "strikethrough", TRUE,
+                                                  NULL );
+            gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
+        }

     }
 
     if (attr.HasTextColour())
     {
     }
 
     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 ),


@@ -115,7 +142,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 ),


@@ -134,25 +163,34 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
                                           gtk_text_iter_get_line(start) );
         gtk_text_iter_forward_line(&para_end);
 
                                           gtk_text_iter_get_line(start) );
         gtk_text_iter_forward_line(&para_end);
 

-        remove_handler_id = g_signal_connect (text_buffer, "remove_tag",
-                                              G_CALLBACK(wxGtkOnRemoveTag),
-                                              gpointer("WXALIGNMENT"));
-        gtk_text_buffer_remove_all_tags( text_buffer, &para_start, &para_end );
-        g_signal_handler_disconnect (text_buffer, remove_handler_id);
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXALIGNMENT", &para_start, &para_end);

 
         GtkJustification align;
         switch (attr.GetAlignment())
         {
 
         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;
             case wxTEXT_ALIGNMENT_RIGHT:
                 align = GTK_JUSTIFY_RIGHT;
                 break;
             case wxTEXT_ALIGNMENT_CENTER:
                 align = GTK_JUSTIFY_CENTER;
                 break;

-            // gtk+ doesn't support justify as of gtk+-2.7.4
+            case wxTEXT_ALIGNMENT_JUSTIFIED:
+#ifdef __WXGTK3__
+                align = GTK_JUSTIFY_FILL;
+                break;
+#elif GTK_CHECK_VERSION(2,11,0)
+// gtk+ doesn't support justify before gtk+-2.11.0 with pango-1.17 being available
+// (but if new enough pango isn't available it's a mere gtk warning)
+                if (!gtk_check_version(2,11,0))
+                {
+                    align = GTK_JUSTIFY_FILL;
+                    break;
+                }
+                // fallthrough
+#endif
+            default:
+                align = GTK_JUSTIFY_LEFT;
+                break;

         }
 
         g_snprintf(buf, sizeof(buf), "WXALIGNMENT %d", align);
         }
 
         g_snprintf(buf, sizeof(buf), "WXALIGNMENT %d", align);


@@ -163,10 +201,93 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
                                               "justification", align, NULL );
         gtk_text_buffer_apply_tag( text_buffer, tag, &para_start, &para_end );
     }
                                               "justification", align, NULL );
         gtk_text_buffer_apply_tag( text_buffer, tag, &para_start, &para_end );
     }

-}
+
+    if (attr.HasLeftIndent())
+    {
+        // Indentation attribute
+
+        // Clear old indentation tags
+        GtkTextIter para_start, para_end = *end;
+        gtk_text_buffer_get_iter_at_line( text_buffer,
+                                          &para_start,
+                                          gtk_text_iter_get_line(start) );
+        gtk_text_iter_forward_line(&para_end);
+
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXINDENT", &para_start, &para_end);
+
+        // Convert indent from 1/10th of a mm into pixels
+        float factor =
+            (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
+                      gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;
+
+        const int indent = (int)(factor * attr.GetLeftIndent());
+        const int subIndent = (int)(factor * attr.GetLeftSubIndent());
+
+        gint gindent;
+        gint gsubindent;
+
+        if (subIndent >= 0)
+        {
+            gindent = indent;
+            gsubindent = -subIndent;
+        }
+        else
+        {
+            gindent = -subIndent;
+            gsubindent = indent;
+        }
+
+        g_snprintf(buf, sizeof(buf), "WXINDENT %d %d", gindent, gsubindent);
+        tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
+                                        buf );
+        if (!tag)
+            tag = gtk_text_buffer_create_tag( text_buffer, buf,
+                                              "left-margin", gindent, "indent", gsubindent, NULL );
+        gtk_text_buffer_apply_tag (text_buffer, tag, &para_start, &para_end);
+    }
+
+    if (attr.HasTabs())
+    {
+        // Set tab stops
+
+        // Clear old tabs
+        GtkTextIter para_start, para_end = *end;
+        gtk_text_buffer_get_iter_at_line( text_buffer,
+                                          &para_start,
+                                          gtk_text_iter_get_line(start) );
+        gtk_text_iter_forward_line(&para_end);
+
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXTABS", &para_start, &para_end);
+
+        const wxArrayInt& tabs = attr.GetTabs();
+
+        wxString tagname = wxT("WXTABS");
+        g_snprintf(buf, sizeof(buf), "WXTABS");
+        for (size_t i = 0; i < tabs.GetCount(); i++)
+            tagname += wxString::Format(wxT(" %d"), tabs[i]);
+
+        const wxWX2MBbuf buftag = tagname.utf8_str();
+
+        tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
+                                        buftag );
+        if (!tag)
+        {
+            // Factor to convert from 1/10th of a mm into pixels
+            float factor =
+                (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
+                          gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;
+
+            PangoTabArray* tabArray = pango_tab_array_new(tabs.GetCount(), TRUE);
+            for (size_t i = 0; i < tabs.GetCount(); i++)
+                pango_tab_array_set_tab(tabArray, i, PANGO_TAB_LEFT, (gint)(tabs[i] * factor));
+            tag = gtk_text_buffer_create_tag( text_buffer, buftag,
+                                              "tabs", tabArray, NULL );
+            pango_tab_array_free(tabArray);
+        }
+        gtk_text_buffer_apply_tag (text_buffer, tag, &para_start, &para_end);
+    }

 }
 
 }
 

-extern "C" {

 static void wxGtkTextInsert(GtkWidget *text,
                             GtkTextBuffer *text_buffer,
                             const wxTextAttr& attr,
 static void wxGtkTextInsert(GtkWidget *text,
                             GtkTextBuffer *text_buffer,
                             const wxTextAttr& attr,


@@ -183,50 +304,7 @@ static void wxGtkTextInsert(GtkWidget *text,
 
     gtk_text_buffer_get_iter_at_offset (text_buffer, &start, start_offset);
 
 
     gtk_text_buffer_get_iter_at_offset (text_buffer, &start, start_offset);
 

-    wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter);
-}
-}
-
-// ----------------------------------------------------------------------------
-// "insert_text" for GtkEntry
-// ----------------------------------------------------------------------------
-
-extern "C" {
-static void
-gtk_insert_text_callback(GtkEditable *editable,
-                         const gchar *new_text,
-                         gint new_text_length,
-                         gint *position,
-                         wxTextCtrl *win)
-{
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    // we should only be called if we have a max len limit at all
-    GtkEntry *entry = GTK_ENTRY (editable);
-
-    wxCHECK_RET( entry->text_max_length, _T("shouldn't be called") );
-
-    // check that we don't overflow the max length limit
-    //
-    // FIXME: this doesn't work when we paste a string which is going to be
-    //        truncated
-    if ( entry->text_length == entry->text_max_length )
-    {
-        // we don't need to run the base class version at all
-        g_signal_stop_emission_by_name (editable, "insert_text");
-
-        // remember that the next changed signal is to be ignored to avoid
-        // generating a dummy wxEVT_COMMAND_TEXT_UPDATED event
-        win->IgnoreNextTextUpdate();
-
-        // and generate the correct one ourselves
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, win->GetId());
-        event.SetEventObject(win);
-        event.SetString(win->GetValue());
-        win->GetEventHandler()->ProcessEvent( event );
-    }
-}
+    wxGtkTextApplyTagsFromAttr(text, text_buffer, attr, &start, &iter);

 }
 
 // Implementation of wxTE_AUTO_URL for wxGTK2 by Mart Raudsepp,
 }
 
 // Implementation of wxTE_AUTO_URL for wxGTK2 by Mart Raudsepp,


@@ -235,9 +313,9 @@ extern "C" {
 static void
 au_apply_tag_callback(GtkTextBuffer *buffer,
                       GtkTextTag *tag,
 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"))
         g_signal_stop_emission_by_name (buffer, "apply_tag");
 {
     if(tag == gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl"))
         g_signal_stop_emission_by_name (buffer, "apply_tag");


@@ -250,7 +328,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);
 }


@@ -258,7 +336,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);
 }


@@ -266,7 +344,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);
 }


@@ -274,7 +352,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 == '/';
 }


@@ -290,7 +368,7 @@ extern "C" {
 static void
 au_check_word( GtkTextIter *s, GtkTextIter *e )
 {
 static void
 au_check_word( GtkTextIter *s, GtkTextIter *e )
 {

-    static const char *URIPrefixes[] =
+    static const char *const URIPrefixes[] =

     {
         "http://",
         "ftp://",
     {
         "http://",
         "ftp://",


@@ -323,14 +401,14 @@ 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;
 
     for( n = 0; n < WXSIZEOF(URIPrefixes); ++n )
     {
         prefix_len = strlen(URIPrefixes[n]);
     size_t len = strlen(text), prefix_len;
     size_t n;
 
     for( n = 0; n < WXSIZEOF(URIPrefixes); ++n )
     {
         prefix_len = strlen(URIPrefixes[n]);

-        if((len > prefix_len) && !strncasecmp(text, URIPrefixes[n], prefix_len))
+        if((len > prefix_len) && !wxStrnicmp(text, URIPrefixes[n], prefix_len))

             break;
     }
 
             break;
     }
 


@@ -382,8 +460,27 @@ au_check_range(GtkTextIter *s,
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

+
+// Normal version used for detecting IME input and generating appropriate
+// events for it.
+void
+wx_insert_text_callback(GtkTextBuffer* buffer,
+                        GtkTextIter* WXUNUSED(end),
+                        gchar *text,
+                        gint WXUNUSED(len),
+                        wxTextCtrl *win)
+{
+    if ( win->GTKOnInsertText(text) )
+    {
+        // If we already handled the new text insertion, don't do it again.
+        g_signal_stop_emission_by_name (buffer, "insert_text");
+    }
+}
+
+
+// And an "after" version used for detecting URLs in the text.

 static void
 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,


@@ -415,7 +512,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)


@@ -434,6 +531,27 @@ au_delete_range_callback(GtkTextBuffer *buffer,
 }
 }
 
 }
 }
 

+//-----------------------------------------------------------------------------
+//  "populate_popup" from text control and "unmap" from its poup menu
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void
+gtk_textctrl_popup_unmap( GtkMenu *WXUNUSED(menu), wxTextCtrl* win )
+{
+    win->GTKEnableFocusOutEvent();
+}
+}
+
+extern "C" {
+static void
+gtk_textctrl_populate_popup( GtkEntry *WXUNUSED(entry), GtkMenu *menu, wxTextCtrl *win )
+{
+    win->GTKDisableFocusOutEvent();
+
+    g_signal_connect (menu, "unmap", G_CALLBACK (gtk_textctrl_popup_unmap), win );
+}
+}

 
 //-----------------------------------------------------------------------------
 //  "changed"
 
 //-----------------------------------------------------------------------------
 //  "changed"


@@ -441,44 +559,35 @@ au_delete_range_callback(GtkTextBuffer *buffer,
 
 extern "C" {
 static void
 
 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->IgnoreTextUpdate() )
         return;
 

-    if (!win->m_hasVMT) return;
-
-    if (g_isIdle)
-        wxapp_install_idle_handler();
+    if ( win->MarkDirtyOnChange() )
+        win->MarkDirty();

 
 

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

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

-// "expose_event" from scrolled window and textview
+//  "mark_set"

 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static gboolean
-gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win )
+static void mark_set(GtkTextBuffer*, GtkTextIter*, GtkTextMark* mark, GSList** markList)

 {
 {

-    return TRUE;
+    if (gtk_text_mark_get_name(mark) == NULL)
+        *markList = g_slist_prepend(*markList, mark);

 }
 }
 
 }
 }
 

-

 //-----------------------------------------------------------------------------
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)
-
-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,22 +615,33 @@ END_EVENT_TABLE()
 
 void wxTextCtrl::Init()
 {
 
 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;
-    m_frozenness = 0;
-    m_gdkHandCursor = NULL;
-    m_gdkXTermCursor = NULL;
+
+    m_text = NULL;
+    m_buffer = NULL;
+    m_showPositionOnThaw = NULL;
+    m_anonymousMarkList = NULL;

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

-    if(m_gdkHandCursor)
-        gdk_cursor_unref(m_gdkHandCursor);
-    if(m_gdkXTermCursor)
-        gdk_cursor_unref(m_gdkXTermCursor);
+    if (m_text)
+        GTKDisconnect(m_text);
+    if (m_buffer)
+        GTKDisconnect(m_buffer);
+
+    // this is also done by wxWindowGTK dtor, but has to be done here so our
+    // DoThaw() override is called
+    while (IsFrozen())
+        Thaw();
+
+    if (m_anonymousMarkList)
+        g_slist_free(m_anonymousMarkList);

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


@@ -547,9 +667,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 ))
     {


@@ -557,65 +674,58 @@ 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)
     {

+        m_buffer = gtk_text_buffer_new(NULL);
+        gulong sig_id = g_signal_connect(m_buffer, "mark_set", G_CALLBACK(mark_set), &m_anonymousMarkList);

         // Create view
         // Create view

-        m_text = gtk_text_view_new();
+        m_text = gtk_text_view_new_with_buffer(m_buffer);
+        // gtk_text_view_set_buffer adds its own reference
+        g_object_unref(m_buffer);
+        g_signal_handler_disconnect(m_buffer, sig_id);

 
 

-        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] = GTK_RANGE(gtk_scrolled_window_get_vscrollbar(GTK_SCROLLED_WINDOW(m_widget)));

 
         // Insert view into scrolled window
         gtk_container_add( GTK_CONTAINER(m_widget), m_text );
 
 
         // 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__
-            if ( !gtk_check_version(2,4,0) )
-            {
-                wrap = GTK_WRAP_WORD_CHAR;
-            }
-            else
-#endif
-            wrap = GTK_WRAP_WORD;
-        }
-
-        gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );
+        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_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_set_can_focus(m_widget, FALSE);

     }
     else
     {
         // a single-line text control: no need for scrollbars
         m_widget =
         m_text = gtk_entry_new();
     }
     else
     {
         // a single-line text control: no need for scrollbars
         m_widget =
         m_text = gtk_entry_new();

+        // work around probable bug in GTK+ 2.18 when calling WriteText on a
+        // new, empty control, see http://trac.wxwidgets.org/ticket/11409
+        gtk_entry_get_text((GtkEntry*)m_text);

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

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

     }
     }

+    g_object_ref(m_widget);

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


@@ -626,65 +736,49 @@ bool wxTextCtrl::Create( wxWindow *parent,
     if (multi_line)
     {
         gtk_widget_show(m_text);
     if (multi_line)
     {
         gtk_widget_show(m_text);

-        SetVScrollAdjustment(gtk_scrolled_window_get_vadjustment((GtkScrolledWindow*)m_widget));

     }
 
     }
 

+    // We want to be notified about text changes.
+    if (multi_line)
+    {
+        g_signal_connect (m_buffer, "changed",
+                          G_CALLBACK (gtk_text_changed_callback), this);
+    }
+    else
+    {
+        g_signal_connect (m_text, "changed",
+                          G_CALLBACK (gtk_text_changed_callback), this);
+    }
+
+    // Catch to disable focus out handling
+    g_signal_connect (m_text, "populate_popup",
+                      G_CALLBACK (gtk_textctrl_populate_popup),
+                      this);
+

     if (!value.empty())
     {
         SetValue( value );
     }
 
     if (style & wxTE_PASSWORD)
     if (!value.empty())
     {
         SetValue( value );
     }
 
     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_editable_set_editable( GTK_EDITABLE(m_text), FALSE );
-        else
-            gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
-    }
+        GTKSetEditable();

 
 

-    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
-    }
+    // left justification (alignment) is the default anyhow
+    if ( style & (wxTE_RIGHT | wxTE_CENTRE) )
+        GTKSetJustification();

 
 

-    // We want to be notified about text changes.

     if (multi_line)
     {
     if (multi_line)
     {

-        g_signal_connect (m_buffer, "changed",
-                          G_CALLBACK (gtk_text_changed_callback), this);
-
-        // .. and handle URLs on multi-line controls with wxTE_AUTO_URL style
+        // 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;

-            m_gdkHandCursor = gdk_cursor_new(GDK_HAND2);
-            m_gdkXTermCursor = gdk_cursor_new(GDK_XTERM);

 
             // We create our wxUrl tag here for slight efficiency gain - we
 
             // We create our wxUrl tag here for slight efficiency gain - we

-            // don't have to check for the tag existance in callbacks,
+            // don't have to check for the tag existence in callbacks,

             // hereby it's guaranteed to exist.
             gtk_text_buffer_create_tag(m_buffer, "wxUrl",
                                        "foreground", "blue",
             // hereby it's guaranteed to exist.
             gtk_text_buffer_create_tag(m_buffer, "wxUrl",
                                        "foreground", "blue",


@@ -711,180 +805,364 @@ bool wxTextCtrl::Create( wxWindow *parent,
             gtk_text_buffer_get_end_iter(m_buffer, &end);
             au_check_range(&start, &end);
         }
             gtk_text_buffer_get_end_iter(m_buffer, &end);
             au_check_range(&start, &end);
         }

+
+        // Also connect a normal (not "after") signal handler for checking for
+        // the IME-generated input.
+        g_signal_connect(m_buffer, "insert_text",
+                         G_CALLBACK(wx_insert_text_callback), this);

     }
     }

-    else
+    else // single line

     {
     {

-        g_signal_connect (m_text, "changed",
-                          G_CALLBACK (gtk_text_changed_callback), this);
+        // do the right thing with Enter presses depending on whether we have
+        // wxTE_PROCESS_ENTER or not
+        GTKSetActivatesDefault();
+
+        GTKConnectInsertTextSignal(GTK_ENTRY(m_text));

     }
 
     }
 

-    m_cursor = wxCursor( wxCURSOR_IBEAM );

 
 

-    wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont());
-    SetDefaultStyle( attrDef );
+    GTKConnectClipboardSignals(m_text);
+
+    m_cursor = wxCursor( wxCURSOR_IBEAM );

 
     return true;
 }
 
 
     return true;
 }
 

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

 
 

-void wxTextCtrl::CalculateScrollbar()
+GtkEntry *wxTextCtrl::GetEntry() const

 {
 {

+    return GTK_ENTRY(m_text);

 }
 
 }
 

+int wxTextCtrl::GTKIMFilterKeypress(GdkEventKey* event) const
+{
+#if GTK_CHECK_VERSION(2, 22, 0)
+    if ( gtk_check_version(2, 12, 0) == 0 )
+    {
+        if ( IsSingleLine() )
+        {
+            return wxTextEntry::GTKIMFilterKeypress(event);
+        }
+        else
+        {
+            return gtk_text_view_im_context_filter_keypress(
+                        GTK_TEXT_VIEW(m_text),
+                        event
+                    );
+        }
+    }
+#else // GTK+ < 2.22
+    wxUnusedVar(event);
+#endif // GTK+ 2.22+
+
+    return FALSE;
+}
+
+// ----------------------------------------------------------------------------
+// flags handling
+// ----------------------------------------------------------------------------
+
+void wxTextCtrl::GTKSetEditable()
+{
+    gboolean editable = !HasFlag(wxTE_READONLY);
+    if ( IsSingleLine() )
+        gtk_editable_set_editable(GTK_EDITABLE(m_text), editable);
+    else
+        gtk_text_view_set_editable(GTK_TEXT_VIEW(m_text), editable);
+}
+
+void wxTextCtrl::GTKSetVisibility()
+{
+    wxCHECK_RET( IsSingleLine(),
+                 "wxTE_PASSWORD is for single line text controls only" );
+
+    gtk_entry_set_visibility(GTK_ENTRY(m_text), !HasFlag(wxTE_PASSWORD));
+}
+
+void wxTextCtrl::GTKSetActivatesDefault()
+{
+    wxCHECK_RET( IsSingleLine(),
+                 "wxTE_PROCESS_ENTER is for single line text controls only" );
+
+    gtk_entry_set_activates_default(GTK_ENTRY(m_text),
+                                    !HasFlag(wxTE_PROCESS_ENTER));
+}
+
+void wxTextCtrl::GTKSetWrapMode()
+{
+    // no wrapping in single line controls
+    if ( !IsMultiLine() )
+        return;
+
+    // translate wx wrapping style to GTK+
+    GtkWrapMode wrap;
+    if ( HasFlag( wxTE_DONTWRAP ) )
+        wrap = GTK_WRAP_NONE;
+    else if ( HasFlag( wxTE_CHARWRAP ) )
+        wrap = GTK_WRAP_CHAR;
+    else if ( HasFlag( wxTE_WORDWRAP ) )
+        wrap = GTK_WRAP_WORD;
+    else // HasFlag(wxTE_BESTWRAP) always true as wxTE_BESTWRAP == 0
+        wrap = GTK_WRAP_WORD_CHAR;
+
+    gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );
+}
+
+void wxTextCtrl::GTKSetJustification()
+{
+    if ( IsMultiLine() )
+    {
+        GtkJustification just;
+        if ( HasFlag(wxTE_RIGHT) )
+            just = GTK_JUSTIFY_RIGHT;
+        else if ( HasFlag(wxTE_CENTRE) )
+            just = GTK_JUSTIFY_CENTER;
+        else // wxTE_LEFT == 0
+            just = GTK_JUSTIFY_LEFT;
+
+        gtk_text_view_set_justification(GTK_TEXT_VIEW(m_text), just);
+    }
+    else // single line
+    {
+        gfloat align;
+        if ( HasFlag(wxTE_RIGHT) )
+            align = 1.0;
+        else if ( HasFlag(wxTE_CENTRE) )
+            align = 0.5;
+        else // single line
+            align = 0.0;
+
+        gtk_entry_set_alignment(GTK_ENTRY(m_text), align);
+    }
+}
+
+void wxTextCtrl::SetWindowStyleFlag(long style)
+{
+    long styleOld = GetWindowStyleFlag();
+
+    wxTextCtrlBase::SetWindowStyleFlag(style);
+
+    if ( (style & wxTE_READONLY) != (styleOld & wxTE_READONLY) )
+        GTKSetEditable();
+
+    if ( (style & wxTE_PASSWORD) != (styleOld & wxTE_PASSWORD) )
+        GTKSetVisibility();
+
+    if ( (style & wxTE_PROCESS_ENTER) != (styleOld & wxTE_PROCESS_ENTER) )
+        GTKSetActivatesDefault();
+
+    static const long flagsWrap = wxTE_WORDWRAP | wxTE_CHARWRAP | wxTE_DONTWRAP;
+    if ( (style & flagsWrap) != (styleOld & flagsWrap) )
+        GTKSetWrapMode();
+
+    static const long flagsAlign = wxTE_LEFT | wxTE_CENTRE | wxTE_RIGHT;
+    if ( (style & flagsAlign) != (styleOld & flagsAlign) )
+        GTKSetJustification();
+}
+
+// ----------------------------------------------------------------------------
+// control value
+// ----------------------------------------------------------------------------
+

 wxString wxTextCtrl::GetValue() const
 {
     wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );
 
 wxString wxTextCtrl::GetValue() const
 {
     wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );
 

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

     {
         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 );
+        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?
+
+    // first check the default text style (we intentionally don't check the
+    // style for the current position as it doesn't make sense for SetValue())
+    const wxTextAttr& style = GetDefaultStyle();
+    wxFontEncoding enc = style.HasFontEncoding() ? style.GetFontEncoding()
+                                         : wxFONTENCODING_SYSTEM;
+
+    // fall back to the controls font if no style
+    if ( enc == wxFONTENCODING_SYSTEM && m_hasFont )
+        enc = GetFont().GetEncoding();
+
+    return enc;
+}
+
+bool wxTextCtrl::IsEmpty() const
+{
+    if ( IsMultiLine() )
+        return gtk_text_buffer_get_char_count(m_buffer) == 0;

 
 

-    return tmp;
+    return wxTextEntry::IsEmpty();

 }
 
 }
 

-void wxTextCtrl::SetValue( const wxString &value )
+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() )
+    {
+        wxTextEntry::DoSetValue(value, flags);
+        return;
+    }
+
+    if (value.IsEmpty())

     {
     {

+        if ( !(flags & SetValue_SendEvent) )
+            EnableTextChangedEvents(false);
+
+        gtk_text_buffer_set_text( m_buffer, "", 0 );
+
+        if ( !(flags & SetValue_SendEvent) )
+            EnableTextChangedEvents(true);
+
+        return;
+    }
+

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-        wxCharBuffer buffer( wxConvUTF8.cWX2MB( value) );
+    const wxCharBuffer buffer(value.utf8_str());

 #else
 #else

-        wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) );
+    wxFontEncoding enc = m_defaultStyle.HasFont()
+                            ? m_defaultStyle.GetFont().GetEncoding()
+                            : wxFONTENCODING_SYSTEM;
+    if ( enc == wxFONTENCODING_SYSTEM )
+        enc = GetTextEncoding();
+
+    const wxCharBuffer buffer(wxGTK_CONV_ENC(value, enc));
+    if ( !buffer )
+    {
+        // see comment in WriteText() as to why we must warn the user about
+        // this
+        wxLogWarning(_("Failed to set text in the text control."));
+        return;
+    }

 #endif
 #endif

-        if (gtk_text_buffer_get_char_count(m_buffer) != 0)
-            IgnoreNextTextUpdate();
-
-        if ( !buffer )
-        {
-            // what else can we do? at least don't crash...
-            return;
-        }

 
 

-        gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
-    }
-    else
+    if ( !(flags & SetValue_SendEvent) )

     {
     {

-        gtk_entry_set_text( GTK_ENTRY(m_text), wxGTK_CONV( value ) );
+        EnableTextChangedEvents(false);

     }
 
     }
 

-    // GRG, Jun/2000: Changed this after a lot of discussion in
-    //   the lists. wxWidgets 2.2 will have a set of flags to
-    //   customize this behaviour.
-    SetInsertionPoint(0);
+    gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );

 
 

-    m_modified = false;
+    if ( !m_defaultStyle.IsDefault() )
+    {
+        GtkTextIter start, end;
+        gtk_text_buffer_get_bounds( m_buffer, &start, &end );
+        wxGtkTextApplyTagsFromAttr(m_widget, m_buffer, m_defaultStyle,
+                                   &start, &end);
+    }
+
+    if ( !(flags & SetValue_SendEvent) )
+    {
+        EnableTextChangedEvents(true);
+    }

 }
 
 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;
+    // we're changing the text programmatically
+    DontMarkDirtyOnNextChange();

 
 

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

     {
     {

+        wxTextEntry::WriteText(text);
+        return;
+    }
+

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-        wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
+    const wxCharBuffer buffer(text.utf8_str());

 #else
 #else

-        wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
-#endif
-        if ( !buffer )
-        {
-            // what else can we do? at least don't crash...
-            return;
-        }
+    // check if we have a specific style for the current position
+    wxFontEncoding enc = wxFONTENCODING_SYSTEM;
+    wxTextAttr style;
+    if ( GetStyle(GetInsertionPoint(), style) && style.HasFontEncoding() )
+    {
+        enc = style.GetFontEncoding();
+    }

 
 

-        // TODO: Call whatever is needed to delete the selection.
-        wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );
+    if ( enc == wxFONTENCODING_SYSTEM )
+        enc = GetTextEncoding();

 
 

-        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 ( wxIsSameDouble(adj->value, adj->upper - adj->page_size) )
-        {
-            gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text),
-                    gtk_text_buffer_get_insert( m_buffer ), 0.0, FALSE, 0.0, 1.0 );
-        }
-    }
-    else // single line
+    const wxCharBuffer buffer(wxGTK_CONV_ENC(text, enc));
+    if ( !buffer )

     {
     {

-        // First remove the selection if there is one
-        gtk_editable_delete_selection( GTK_EDITABLE(m_text) );
+        // we must log an error here as losing the text like this can be a
+        // serious problem (e.g. imagine the document edited by user being
+        // empty instead of containing the correct text)
+        wxLogWarning(_("Failed to insert text in the control."));
+        return;
+    }
+#endif

 
 

-        // This moves the cursor pos to behind the inserted text.
-        gint len = gtk_editable_get_position(GTK_EDITABLE(m_text));
+    // First remove the selection if there is one
+    gtk_text_buffer_delete_selection(m_buffer, false, true);

 
 

-#if wxUSE_UNICODE
-        wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
-#else
-        wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
-#endif
-        if ( !buffer )
+    // Insert the text
+    wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );
+
+    // 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())
+    {
+        GtkAdjustment* adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(m_widget));
+        const double value = gtk_adjustment_get_value(adj);
+        const double upper = gtk_adjustment_get_upper(adj);
+        const double page_size = gtk_adjustment_get_page_size(adj);
+        if (wxIsSameDouble(value, upper - page_size))

         {
         {

-            // what else can we do? at least don't crash...
-            return;
+            gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(m_text),
+                gtk_text_buffer_get_insert(m_buffer), 0, false, 0, 1);

         }
         }

-
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
-
-        // Bring entry's cursor uptodate.
-        gtk_editable_set_position( GTK_EDITABLE(m_text), len );

     }
     }

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

     {
         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 = line;
         GtkTextIter end = line;

-        gtk_text_iter_forward_to_line_end(&end);
-        gchar *text = gtk_text_buffer_get_text(m_buffer,&line,&end,TRUE);
-        wxString result(wxGTK_CONV_BACK(text));
-        g_free(text);
-        return result;
+        // 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) )


@@ -896,22 +1174,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() )

     {
         GtkTextIter iter;
     {
         GtkTextIter iter;

-        gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos);
-        if (gtk_text_iter_is_end(&iter))
+
+        if (pos > GetLastPosition())

             return false;
 
             return false;
 

-        *y = gtk_text_iter_get_line(&iter);
-        *x = gtk_text_iter_get_line_offset(&iter);
+        gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos);
+
+        if ( y )
+            *y = gtk_text_iter_get_line(&iter);
+        if ( x )
+            *x = gtk_text_iter_get_line_offset(&iter);

     }
     else // single line control
     {
     }
     else // single line control
     {

-        if ( pos <= GTK_ENTRY(m_text)->text_length )
+        if (pos <= gtk_entry_get_text_length(GTK_ENTRY(m_text)))

         {
         {

-            *y = 0;
-            *x = pos;
+            if ( y )
+                *y = 0;
+            if ( x )
+                *x = pos;

         }
         else
         {
         }
         else
         {


@@ -925,7 +1209,8 @@ 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))
 
     GtkTextIter iter;
     if (y >= gtk_text_buffer_get_line_count (m_buffer))


@@ -940,7 +1225,7 @@ long wxTextCtrl::XYToPosition(long x, long y ) const
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 {

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

     {
         int last_line = gtk_text_buffer_get_line_count( m_buffer ) - 1;
         if (lineNo > last_line)
     {
         int last_line = gtk_text_buffer_get_line_count( m_buffer ) - 1;
         if (lineNo > last_line)


@@ -958,35 +1243,42 @@ int wxTextCtrl::GetLineLength(long lineNo) const
     }
 }
 
     }
 }
 

-int wxTextCtrl::GetNumberOfLines() const
+wxPoint wxTextCtrl::DoPositionToCoords(long pos) const

 {
 {

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

     {
     {

-        GtkTextIter iter;
-        gtk_text_buffer_get_iter_at_offset( m_buffer, &iter, 0 );
+        // Single line text entry (GtkTextEntry) doesn't have support for
+        // getting the coordinates for the given offset. Perhaps we could
+        // find them ourselves by using GetTextExtent() but for now just leave
+        // it unimplemented, this function is more useful for multiline
+        // controls anyhow.
+        return wxDefaultPosition;
+    }

 
 

-        // move forward by one display line until the end is reached
-        int lineCount = 1;
-        while ( gtk_text_view_forward_display_line(GTK_TEXT_VIEW(m_text), &iter) )
-        {
-            lineCount++;
-        }
+    // Window coordinates for the given position is calculated by getting
+    // the buffer coordinates and converting them to window coordinates.
+    GtkTextView *textview = GTK_TEXT_VIEW(m_text);

 
 

-        // If the last character in the text buffer is a newline,
-        // gtk_text_view_forward_display_line() will return false without that
-        // line being counted. Must add one manually in that case.
-        GtkTextIter lastCharIter;
-        gtk_text_buffer_get_iter_at_offset
-        (
-            m_buffer,
-            &lastCharIter,
-            gtk_text_buffer_get_char_count(m_buffer) - 1
-        );
-        gchar lastChar = gtk_text_iter_get_char( &lastCharIter );
-        if ( lastChar == wxT('\n') )
-            lineCount++;
-
-        return lineCount;
+    GtkTextIter iter;
+    gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos);
+
+    GdkRectangle bufferCoords;
+    gtk_text_view_get_iter_location(textview, &iter, &bufferCoords);
+
+    gint winCoordX = 0,
+         winCoordY = 0;
+    gtk_text_view_buffer_to_window_coords(textview, GTK_TEXT_WINDOW_WIDGET,
+                                          bufferCoords.x, bufferCoords.y,
+                                          &winCoordX, &winCoordY);
+
+    return wxPoint(winCoordX, winCoordY);
+}
+
+int wxTextCtrl::GetNumberOfLines() const
+{
+    if ( IsMultiLine() )
+    {
+        return gtk_text_buffer_get_line_count( m_buffer );

     }
     else // single line
     {
     }
     else // single line
     {


@@ -1003,32 +1295,16 @@ void wxTextCtrl::SetInsertionPoint( long pos )
         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
-    {
-        // FIXME: Is the editable's cursor really uptodate without double set_position in GTK2?
-        gtk_editable_set_position(GTK_EDITABLE(m_text), int(pos));
-    }
-}
-
-void wxTextCtrl::SetInsertionPointEnd()
-{
-    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-
-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-        GtkTextIter end;
-        gtk_text_buffer_get_end_iter( m_buffer, &end );
-        gtk_text_buffer_place_cursor( m_buffer, &end );
+        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_editable_set_position( GTK_EDITABLE(m_text), -1 );
+        wxTextEntry::SetInsertionPoint(pos);

     }
 }
 
     }
 }
 


@@ -1036,13 +1312,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() )

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

-    else
+    else // single line

     {
     {

-        gtk_editable_set_editable( GTK_EDITABLE(m_text), editable );
+        wxTextEntry::SetEditable(editable);

     }
 }
 
     }
 }
 


@@ -1054,38 +1330,12 @@ bool wxTextCtrl::Enable( bool enable )
         return false;
     }
 
         return false;
     }
 

-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-        SetEditable( enable );
-    }
-    else
-    {
-        gtk_widget_set_sensitive( m_text, enable );
-    }
+    gtk_widget_set_sensitive( m_text, enable );
+    SetCursor(enable ? wxCursor(wxCURSOR_IBEAM) : wxCursor());

 
     return true;
 }
 
 
     return true;
 }
 

-// wxGTK-specific: called recursively by Enable,
-// to give widgets an oppprtunity to correct their colours after they
-// have been changed by Enable
-void wxTextCtrl::OnParentEnable( bool enable )
-{
-    // If we have a custom background colour, we use this colour in both
-    // disabled and enabled mode, or we end up with a different colour under the
-    // text.
-    wxColour oldColour = GetBackgroundColour();
-    if (oldColour.Ok())
-    {
-        // Need to set twice or it'll optimize the useful stuff out
-        if (oldColour == * wxWHITE)
-            SetBackgroundColour(*wxBLACK);
-        else
-            SetBackgroundColour(*wxWHITE);
-        SetBackgroundColour(oldColour);
-    }
-}
-

 void wxTextCtrl::MarkDirty()
 {
     m_modified = true;
 void wxTextCtrl::MarkDirty()
 {
     m_modified = true;


@@ -1097,19 +1347,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;
     }


@@ -1117,68 +1376,55 @@ 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 )
-        {
-            g_signal_connect (m_text, "insert_text",
-                              G_CALLBACK (gtk_insert_text_callback), this);
-        }
-        else // no checking
-        {
-            g_signal_handlers_disconnect_by_func (m_text,
-                    (gpointer) gtk_insert_text_callback, this);
-        }
+        return false;

     }
     }

+
+    return true;

 }
 
 void wxTextCtrl::SetSelection( long from, long to )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 }
 
 void wxTextCtrl::SetSelection( long from, long to )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-    if (from == -1 && to == -1)
+    if ( IsMultiLine() )

     {
     {

-        from = 0;
-        to = GetValue().length();
-    }
+        if (from == -1 && to == -1)
+        {
+            from = 0;
+            to = GetValue().length();
+        }

 
 

-    if (m_windowStyle & wxTE_MULTILINE)
-    {

         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 );
 
         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 );
+        gtk_text_buffer_select_range( m_buffer, &fromi, &toi );

     }
     }

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

     {
         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 );
+        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);

     }
 }
 
     }
 }
 


@@ -1212,7 +1458,7 @@ long wxTextCtrl::GetInsertionPoint() const
 {
     wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
 
 {
     wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
 

-    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


@@ -1226,7 +1472,7 @@ long wxTextCtrl::GetInsertionPoint() const
     }
     else
     {
     }
     else
     {

-        return (long) gtk_editable_get_position(GTK_EDITABLE(m_text));
+        return wxTextEntry::GetInsertionPoint();

     }
 }
 
     }
 }
 


@@ -1236,16 +1482,16 @@ wxTextPos wxTextCtrl::GetLastPosition() const
 
     int pos = 0;
 
 
     int pos = 0;
 

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

     {
         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
+    else // single line

     {
     {

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

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


@@ -1255,7 +1501,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") );
 

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


@@ -1264,19 +1510,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

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

     {
     {

-        SetInsertionPoint( from );
-        WriteText( value );
+        wxTextEntry::Remove(from, to);

     }
 }
 
     }
 }
 


@@ -1284,57 +1519,30 @@ void wxTextCtrl::Cut()
 {
     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() )

         g_signal_emit_by_name (m_text, "cut-clipboard");
     else
         g_signal_emit_by_name (m_text, "cut-clipboard");
     else

-        gtk_editable_cut_clipboard(GTK_EDITABLE(m_text));
+        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") );
 

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

         g_signal_emit_by_name (m_text, "copy-clipboard");
     else
         g_signal_emit_by_name (m_text, "copy-clipboard");
     else

-        gtk_editable_copy_clipboard(GTK_EDITABLE(m_text));
+        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") );
 

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

         g_signal_emit_by_name (m_text, "paste-clipboard");
     else
         g_signal_emit_by_name (m_text, "paste-clipboard");
     else

-        gtk_editable_paste_clipboard(GTK_EDITABLE(m_text));
-}
-
-// 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


@@ -1343,39 +1551,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;
-
-     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;
-         }
-     }
-
-     if (! haveSelection )
-          from = to = GetInsertionPoint();
-
-     if ( from > to )
-     {
-         // exchange them to be compatible with wxMSW
-         gint tmp = from;
-         from = to;
-         to = tmp;
-     }
+    if ( !IsMultiLine() )
+    {
+        wxTextEntry::GetSelection(fromOut, toOut);
+        return;
+    }
+
+    gint from, to;
+
+    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;
+        }
+    }
+    else // no selection
+    {
+        from =
+        to = GetInsertionPoint();
+    }

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


@@ -1388,13 +1590,13 @@ bool wxTextCtrl::IsEditable() const
 {
     wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
 
 {
     wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
 

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

     {
     {

-        return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text));
+        return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text)) != 0;

     }
     else
     {
     }
     else
     {

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

     }
 }
 
     }
 }
 


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

-void wxTextCtrl::Clear()
-{
-    SetValue( wxEmptyString );
-}
-

 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 & wxTE_PROCESS_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_TEXT_ENTER, m_windowId);
+            event.SetEventObject(this);
+            event.SetString(GetValue());
+            if ( HandleWindowEvent(event) )

                 return;
                 return;

-            }

         }
     }
 
         }
     }
 


@@ -1449,15 +1629,21 @@ 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() )

     {
     {

-        return window == gtk_text_view_get_window( GTK_TEXT_VIEW( m_text ), GTK_TEXT_WINDOW_TEXT );  // pure guesswork
+        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);
+#ifdef __WXGTK3__
+        // no access to internal GdkWindows
+        return NULL;
+#else
+        return gtk_entry_get_text_window(GTK_ENTRY(m_text));
+#endif

     }
 }
 
     }
 }
 


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

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

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


@@ -1490,8 +1676,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

-    wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE),
-                  _T("shouldn't be called for single line controls") );
+    wxASSERT_MSG( IsMultiLine(),
+                  wxT("shouldn't be called for single line controls") );

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


@@ -1521,7 +1707,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
     if ( !wxControl::SetBackgroundColour( colour ) )
         return false;
 
     if ( !wxControl::SetBackgroundColour( colour ) )
         return false;
 

-    if (!m_backgroundColour.Ok())
+    if (!m_backgroundColour.IsOk())

         return false;
 
     // change active background color too
         return false;
 
     // change active background color too


@@ -1532,7 +1718,7 @@ 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() )
         {
     {
         if ( style.IsDefault() )
         {


@@ -1543,30 +1729,68 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
         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,

-                     _T("invalid range in wxTextCtrl::SetStyle") );
+                     wxT("invalid range in wxTextCtrl::SetStyle") );

 
         GtkTextIter starti, endi;
         gtk_text_buffer_get_iter_at_offset( m_buffer, &starti, start );
         gtk_text_buffer_get_iter_at_offset( m_buffer, &endi, end );
 
 
         GtkTextIter starti, endi;
         gtk_text_buffer_get_iter_at_offset( m_buffer, &starti, start );
         gtk_text_buffer_get_iter_at_offset( m_buffer, &endi, end );
 

-        // use the attributes from style which are set in it and fall back
-        // first to the default style and then to the text control default
-        // colours for the others
-        wxTextAttr attr = wxTextAttr::Combine(style, m_defaultStyle, this);
-
-        wxGtkTextApplyTagsFromAttr( m_buffer, attr, &starti, &endi );
+        wxGtkTextApplyTagsFromAttr( m_widget, m_buffer, style, &starti, &endi );

 
         return true;
     }
 
         return true;
     }

+    //else: single line text controls don't support styles

 
 

-    // else single line
-    // cannot do this for GTK+'s Entry widget

     return false;
 }
 
     return false;
 }
 

+bool wxTextCtrl::GetStyle(long position, wxTextAttr& style)
+{
+    if ( !IsMultiLine() )
+    {
+        // no styles for GtkEntry
+        return false;
+    }
+
+    gint l = gtk_text_buffer_get_char_count( m_buffer );
+
+    wxCHECK_MSG( position >= 0 && position <= l, false,
+                 wxT("invalid range in wxTextCtrl::GetStyle") );
+
+    GtkTextIter positioni;
+    gtk_text_buffer_get_iter_at_offset(m_buffer, &positioni, position);
+
+    // Obtain a copy of the default attributes
+    GtkTextAttributes * const
+        pattr = gtk_text_view_get_default_attributes(GTK_TEXT_VIEW(m_text));
+    wxON_BLOCK_EXIT1(gtk_text_attributes_unref, pattr);
+
+    // And query GTK for the attributes at the given position using it as base
+    if ( !gtk_text_iter_get_attributes(&positioni, pattr) )
+    {
+        style = m_defaultStyle;
+    }
+    else // have custom attributes
+    {
+        style.SetBackgroundColour(pattr->appearance.bg_color);
+        style.SetTextColour(pattr->appearance.fg_color);
+
+        const wxGtkString
+            pangoFontString(pango_font_description_to_string(pattr->font));
+
+        wxFont font;
+        if ( font.SetNativeFontInfo(wxString(pangoFontString)) )
+            style.SetFont(font);
+
+        // TODO: set alignment, tabs and indents
+    }
+
+    return true;
+}
+

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

-    gtk_widget_modify_style(m_text, style);
+    GTKApplyStyle(m_text, style);

 }
 
 void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))
 }
 
 void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))


@@ -1619,73 +1843,128 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
     event.Enable( CanRedo() );
 }
 
     event.Enable( CanRedo() );
 }
 

-void wxTextCtrl::OnInternalIdle()
+wxSize wxTextCtrl::DoGetBestSize() const
+{
+    return DoGetSizeFromTextSize(80);
+}
+
+wxSize wxTextCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const

 {
 {

-    wxCursor cursor = m_cursor;
-    if (g_globalCursor.Ok()) cursor = g_globalCursor;
+    wxASSERT_MSG( m_widget, wxS("GetSizeFromTextSize called before creation") );

 
 

-    if (g_delayedFocus == this)
+    wxSize tsize(xlen, 0);
+    int cHeight = GetCharHeight();
+
+    if ( IsSingleLine() )

     {
     {

-        if (GTK_WIDGET_REALIZED(m_widget))
+        if ( HasFlag(wxBORDER_NONE) )
+        {
+            tsize.y = cHeight;
+#ifdef __WXGTK3__
+            tsize.IncBy(9, 0);
+#else
+            tsize.IncBy(4, 0);
+#endif // GTK3
+        }
+        else

         {
         {

-            gtk_widget_grab_focus( m_widget );
-            g_delayedFocus = NULL;
+            // default height
+            tsize.y = GTKGetPreferredSize(m_widget).y;
+            // Add the margins we have previously set, but only the horizontal border
+            // as vertical one has been taken account at GTKGetPreferredSize().
+            // Also get other GTK+ margins.
+            tsize.IncBy( GTKGetEntryMargins(GetEntry()).x, 0);

         }
     }
 
         }
     }
 

-    if (wxUpdateUIEvent::CanUpdate(this))
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
+    //multiline
+    else
+    {
+        // add space for vertical scrollbar
+        if ( m_scrollBar[1] && !(m_windowStyle & wxTE_NO_VSCROLL) )
+            tsize.IncBy(GTKGetPreferredSize(GTK_WIDGET(m_scrollBar[1])).x + 3, 0);

 
 

-wxSize wxTextCtrl::DoGetBestSize() const
-{
-    // FIXME should be different for multi-line controls...
-    wxSize ret( wxControl::DoGetBestSize() );
-    wxSize best(80, ret.y);
-    CacheBestSize(best);
-    return best;
+        // height
+        tsize.y = cHeight;
+        if ( ylen <= 0 )
+        {
+            tsize.y = 1 + cHeight * wxMax(wxMin(GetNumberOfLines(), 10), 2);
+            // add space for horizontal scrollbar
+            if ( m_scrollBar[0] && (m_windowStyle & wxHSCROLL) )
+                tsize.IncBy(0, GTKGetPreferredSize(GTK_WIDGET(m_scrollBar[0])).y + 3);
+        }
+
+        if ( !HasFlag(wxBORDER_NONE) )
+        {
+            // hardcode borders, margins, etc
+            tsize.IncBy(5, 4);
+        }
+    }
+
+    // Perhaps the user wants something different from CharHeight, or ylen
+    // is used as the height of a multiline text.
+    if ( ylen > 0 )
+        tsize.IncBy(0, ylen - cHeight);
+
+    return tsize;

 }
 
 }
 

+

 // ----------------------------------------------------------------------------
 // freeze/thaw
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // freeze/thaw
 // ----------------------------------------------------------------------------
 

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

 {
 {

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

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

-        if ( !m_frozenness++ )
+        // removing buffer dramatically speeds up insertion:
+        g_object_ref(m_buffer);
+        GtkTextBuffer* buf_new = gtk_text_buffer_new(NULL);
+        gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), buf_new);
+        // gtk_text_view_set_buffer adds its own reference
+        g_object_unref(buf_new);
+        // These marks should be deleted when the buffer is changed,
+        // but they are not (in GTK+ up to at least 3.0.1).
+        // Otherwise these anonymous marks start to build up in the buffer,
+        // and Freeze takes longer and longer each time it is called.
+        if (m_anonymousMarkList)

         {
         {

-            // 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);
-            gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), gtk_text_buffer_new(NULL));
+            for (GSList* item = m_anonymousMarkList; item; item = item->next)
+            {
+                GtkTextMark* mark = static_cast<GtkTextMark*>(item->data);
+                if (GTK_IS_TEXT_MARK(mark) && !gtk_text_mark_get_deleted(mark))
+                    gtk_text_buffer_delete_mark(m_buffer, mark);
+            }
+            g_slist_free(m_anonymousMarkList);
+            m_anonymousMarkList = NULL;

         }
     }
 }
 
         }
     }
 }
 

-void wxTextCtrl::Thaw()
+void wxTextCtrl::DoThaw()

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

-        wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") );
+        // reattach buffer:
+        gulong sig_id = g_signal_connect(m_buffer, "mark_set", G_CALLBACK(mark_set), &m_anonymousMarkList);
+        gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), m_buffer);
+        g_object_unref(m_buffer);
+        g_signal_handler_disconnect(m_buffer, sig_id);

 
 

-        if ( !--m_frozenness )
+        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;

         }
     }
         }
     }

+
+    GTKThawWidget(m_text);

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


@@ -1698,7 +1977,7 @@ void wxTextCtrl::Thaw()
 void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event)
 {
     event.Skip();
 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;


@@ -1712,13 +1991,11 @@ void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event)
     gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(m_text), &end, x, y);
     if (!gtk_text_iter_has_tag(&end, tag))
     {
     gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(m_text), &end, x, y);
     if (!gtk_text_iter_has_tag(&end, tag))
     {

-        gdk_window_set_cursor(gtk_text_view_get_window(GTK_TEXT_VIEW(m_text),
-                              GTK_TEXT_WINDOW_TEXT), m_gdkXTermCursor);
+        SetCursor(wxCursor(wxCURSOR_IBEAM));

         return;
     }
 
         return;
     }
 

-    gdk_window_set_cursor(gtk_text_view_get_window(GTK_TEXT_VIEW(m_text),
-                          GTK_TEXT_WINDOW_TEXT), m_gdkHandCursor);
+    SetCursor(wxCursor(wxCURSOR_HAND));

 
     start = end;
     if(!gtk_text_iter_begins_tag(&start, tag))
 
     start = end;
     if(!gtk_text_iter_begins_tag(&start, tag))


@@ -1727,7 +2004,7 @@ void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event)
         gtk_text_iter_forward_to_tag_toggle(&end, tag);
 
     // Native context menu is probably not desired on an URL.
         gtk_text_iter_forward_to_tag_toggle(&end, tag);
 
     // Native context menu is probably not desired on an URL.

-    // Consider making this dependant on ProcessEvent(wxTextUrlEvent) return value
+    // Consider making this dependent on ProcessEvent(wxTextUrlEvent) return value

     if(event.GetEventType() == wxEVT_RIGHT_DOWN)
         event.Skip(false);
 
     if(event.GetEventType() == wxEVT_RIGHT_DOWN)
         event.Skip(false);
 


@@ -1737,13 +2014,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);
+    //event.Skip(!HandleWindowEvent(url_event));
+    HandleWindowEvent(url_event);
+}
+
+bool wxTextCtrl::GTKProcessEvent(wxEvent& event) const
+{
+    bool rc = wxTextCtrlBase::GTKProcessEvent(event);
+
+    // GtkTextView starts a drag operation when left mouse button is pressed
+    // and ends it when it is released and if it doesn't get the release event
+    // the next click on a control results in an assertion failure inside
+    // gtk_text_view_start_selection_drag() which simply *kills* the program
+    // without anything we can do about it, so always let GTK+ have this event
+    return rc && (IsSingleLine() || event.GetEventType() != wxEVT_LEFT_UP);

 }
 
 // static
 wxVisualAttributes
 wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
 }
 
 // static
 wxVisualAttributes
 wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {

-    return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true);
+    return GetDefaultAttributesFromGTKWidget(gtk_entry_new(), true);

 }
 }

+
+#endif // wxUSE_TEXTCTRL