Minimum is now GTK+ 2.4

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 7443a8f3c9ab5b145a8a028b69ae331f2d2bd8d2..b44668c172ad35f164a78bb69ad0cb00d9299bbc 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -10,6 +10,8 @@
 // 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"
 
 #ifndef WX_PRECOMP
 #include "wx/textctrl.h"
 
 #ifndef WX_PRECOMP


@@ -36,8 +38,8 @@
 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;


@@ -51,7 +53,24 @@ static void wxGtkOnRemoveTag(GtkTextBuffer *buffer,
 }
 }
 
 }
 }
 

-extern "C" {
+// 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,
 static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
                                        GtkTextBuffer *text_buffer,
                                        const wxTextAttr& attr,


@@ -61,14 +80,13 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
     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())
     {

-        PangoFontDescription *font_description = attr.GetFont().GetNativeFontInfo()->description;
+        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 ),
         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 ),


@@ -79,7 +97,7 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
                                               NULL );
         gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
 
                                               NULL );
         gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
 

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


@@ -95,6 +113,8 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
 
     if (attr.HasTextColour())
     {
 
     if (attr.HasTextColour())
     {

+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFORECOLOR", start, end);
+

         const GdkColor *colFg = attr.GetTextColour().GetColor();
         g_snprintf(buf, sizeof(buf), "WXFORECOLOR %d %d %d",
                    colFg->red, colFg->green, colFg->blue);
         const GdkColor *colFg = attr.GetTextColour().GetColor();
         g_snprintf(buf, sizeof(buf), "WXFORECOLOR %d %d %d",
                    colFg->red, colFg->green, colFg->blue);


@@ -108,6 +128,8 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
 
     if (attr.HasBackgroundColour())
     {
 
     if (attr.HasBackgroundColour())
     {

+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXBACKCOLOR", start, end);
+

         const GdkColor *colBg = attr.GetBackgroundColour().GetColor();
         g_snprintf(buf, sizeof(buf), "WXBACKCOLOR %d %d %d",
                    colBg->red, colBg->green, colBg->blue);
         const GdkColor *colBg = attr.GetBackgroundColour().GetColor();
         g_snprintf(buf, sizeof(buf), "WXBACKCOLOR %d %d %d",
                    colBg->red, colBg->green, colBg->blue);


@@ -127,11 +149,7 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
                                           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", start, end);

 
         GtkJustification align;
         switch (attr.GetAlignment())
 
         GtkJustification align;
         switch (attr.GetAlignment())


@@ -145,7 +163,16 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
             case wxTEXT_ALIGNMENT_CENTER:
                 align = GTK_JUSTIFY_CENTER;
                 break;
             case wxTEXT_ALIGNMENT_CENTER:
                 align = GTK_JUSTIFY_CENTER;
                 break;

-            // gtk+ doesn't support justify as of gtk+-2.7.4
+// 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

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


@@ -168,11 +195,7 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
                                           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("WXINDENT"));
-        gtk_text_buffer_remove_all_tags( text_buffer, &para_start, &para_end );
-        g_signal_handler_disconnect (text_buffer, remove_handler_id);
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXINDENT", start, end);

 
         // Convert indent from 1/10th of a mm into pixels
         float factor;
 
         // Convert indent from 1/10th of a mm into pixels
         float factor;


@@ -221,11 +244,7 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
                                           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("WXTABS"));
-        gtk_text_buffer_remove_all_tags( text_buffer, &para_start, &para_end );
-        g_signal_handler_disconnect (text_buffer, remove_handler_id);
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXTABS", start, end);

 
         const wxArrayInt& tabs = attr.GetTabs();
 
 
         const wxArrayInt& tabs = attr.GetTabs();
 


@@ -234,10 +253,10 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
         for (size_t i = 0; i < tabs.GetCount(); i++)
             tagname += wxString::Format(_T(" %d"), tabs[i]);
 
         for (size_t i = 0; i < tabs.GetCount(); i++)
             tagname += wxString::Format(_T(" %d"), tabs[i]);
 

-        const wxWX2MBbuf buf = tagname.mb_str(wxConvUTF8);
+        const wxWX2MBbuf buftag = tagname.utf8_str();

 
         tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
 
         tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),

-                                        buf );
+                                        buftag );

         if (!tag)
         {
             // Factor to convert from 1/10th of a mm into pixels
         if (!tag)
         {
             // Factor to convert from 1/10th of a mm into pixels


@@ -253,16 +272,14 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
             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));
             PangoTabArray* tabArray = pango_tab_array_new(tabs.GetCount(), TRUE);
             for (size_t i = 0; i < tabs.GetCount(); i++)
                 pango_tab_array_set_tab(tabArray, i, PANGO_TAB_LEFT, (gint)(tabs[i] * factor));

-            tag = gtk_text_buffer_create_tag( text_buffer, buf,
+            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);
     }
 }
                                               "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,


@@ -281,49 +298,6 @@ static void wxGtkTextInsert(GtkWidget *text,
 
     wxGtkTextApplyTagsFromAttr(text, text_buffer, attr, &start, &iter);
 }
 
     wxGtkTextApplyTagsFromAttr(text, text_buffer, attr, &start, &iter);
 }

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

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


@@ -331,9 +305,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");


@@ -346,7 +320,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);
 }


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


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


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


@@ -419,7 +393,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;
 


@@ -479,7 +453,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,


@@ -511,7 +485,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)


@@ -537,16 +511,13 @@ 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->m_hasVMT) return;
 
 {
     if ( win->IgnoreTextUpdate() )
         return;
 
     if (!win->m_hasVMT) return;
 

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     if ( win->MarkDirtyOnChange() )
         win->MarkDirty();
 
     if ( win->MarkDirtyOnChange() )
         win->MarkDirty();
 


@@ -602,7 +573,9 @@ gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
 
 extern "C" {
 static gboolean
 
 extern "C" {
 static gboolean

-gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win )
+gtk_text_exposed_callback( GtkWidget * WXUNUSED(widget),
+                           GdkEventExpose * WXUNUSED(event),
+                           wxTextCtrl * WXUNUSED(win) )

 {
     return TRUE;
 }
 {
     return TRUE;
 }


@@ -651,7 +624,8 @@ void wxTextCtrl::Init()
     SetUpdateFont(false);
 
     m_text = NULL;
     SetUpdateFont(false);
 
     m_text = NULL;

-    m_frozenness = 0;
+    m_freezeCount = 0;
+    m_showPositionOnThaw = NULL;

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


@@ -687,9 +661,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 ))
     {


@@ -706,38 +677,25 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
         m_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
 
 
         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 );
 
         // 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 );
 

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

 
         GtkScrolledWindowSetBorder(m_widget, style);
 
 
         GtkScrolledWindowSetBorder(m_widget, style);
 


@@ -766,54 +724,39 @@ bool wxTextCtrl::Create( wxWindow *parent,
         gtk_widget_show(m_text);
     }
 
         gtk_widget_show(m_text);
     }
 

+    // We want to be notified about text changes.
+    if (multi_line)
+    {
+        g_signal_connect (m_buffer, "changed",
+                          G_CALLBACK (gtk_text_changed_callback), this);
+    }
+    else
+    {
+        g_signal_connect (m_text, "changed",
+                          G_CALLBACK (gtk_text_changed_callback), 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
-    }
+    if (style & wxTE_PROCESS_ENTER)
+        GTKSetActivatesDefault();
+
+    // 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;


@@ -849,11 +792,6 @@ bool wxTextCtrl::Create( wxWindow *parent,
             au_check_range(&start, &end);
         }
     }
             au_check_range(&start, &end);
         }
     }

-    else
-    {
-        g_signal_connect (m_text, "changed",
-                          G_CALLBACK (gtk_text_changed_callback), this);
-    }

 
     g_signal_connect (m_text, "copy-clipboard",
                       G_CALLBACK (gtk_copy_clipboard_callback), this);
 
     g_signal_connect (m_text, "copy-clipboard",
                       G_CALLBACK (gtk_copy_clipboard_callback), this);


@@ -864,22 +802,143 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
     m_cursor = wxCursor( wxCURSOR_IBEAM );
 
 
     m_cursor = wxCursor( wxCURSOR_IBEAM );
 

-    wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont());
-    SetDefaultStyle( attrDef );
-

     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()
+// ----------------------------------------------------------------------------
+// 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
+    {
+        // 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 // __WXGTK24__
+        wrap = GTK_WRAP_WORD;
+    }
+
+    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
+    {
+#ifdef __WXGTK24__
+        // gtk_entry_set_alignment was introduced in gtk+-2.3.5
+        if (!gtk_check_version(2,4,0))
+        {
+            gfloat align;
+            if ( HasFlag(wxTE_RIGHT) )
+                align = 1.0;
+            else if ( HasFlag(wxTE_CENTRE) )
+                align = 0.5;
+            else // single line
+                align = 0.0;
+
+            gtk_entry_set_alignment(GTK_ENTRY(m_text), align);
+        }
+#endif // __WXGTK24__
+    }
+
+}
+
+void wxTextCtrl::SetWindowStyleFlag(long style)
+{
+    long styleOld = GetWindowStyleFlag();
+
+    wxTextCtrlBase::SetWindowStyleFlag(style);
+
+    if ( (style & wxTE_READONLY) != (styleOld & wxTE_READONLY) )
+        GTKSetEditable();
+
+    if ( (style & wxTE_PASSWORD) != (styleOld & wxTE_PASSWORD) )
+        GTKSetVisibility();
+
+    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 ( IsMultiLine() )
     {
         GtkTextIter start;
     if ( IsMultiLine() )
     {
         GtkTextIter start;


@@ -888,19 +947,12 @@ wxString wxTextCtrl::GetValue() const
         gtk_text_buffer_get_end_iter( m_buffer, &end );
         wxGtkString text(gtk_text_buffer_get_text(m_buffer, &start, &end, true));
 
         gtk_text_buffer_get_end_iter( m_buffer, &end );
         wxGtkString text(gtk_text_buffer_get_text(m_buffer, &start, &end, true));
 

-        const wxWxCharBuffer buf = wxGTK_CONV_BACK(text);
-        if ( buf )
-            tmp = buf;
+        return wxGTK_CONV_BACK(text);

     }
     }

-    else
+    else // single line

     {
     {

-        const gchar *text = gtk_entry_get_text( GTK_ENTRY(m_text) );
-        const wxWxCharBuffer buf = wxGTK_CONV_BACK( text );
-        if ( buf )
-            tmp = buf;
+        return wxTextEntry::GetValue();

     }
     }

-
-    return tmp;

 }
 
 wxFontEncoding wxTextCtrl::GetTextEncoding() const
 }
 
 wxFontEncoding wxTextCtrl::GetTextEncoding() const


@@ -911,7 +963,7 @@ wxFontEncoding wxTextCtrl::GetTextEncoding() const
     // 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();
     // first check the default text style (we intentionally don't check the
     // style for the current position as it doesn't make sense for SetValue())
     const wxTextAttr& style = GetDefaultStyle();

-    wxFontEncoding enc = style.HasFont() ? style.GetFont().GetEncoding()
+    wxFontEncoding enc = style.HasFontEncoding() ? style.GetFontEncoding()

                                          : wxFONTENCODING_SYSTEM;
 
     // fall back to the controls font if no style
                                          : wxFONTENCODING_SYSTEM;
 
     // fall back to the controls font if no style


@@ -926,21 +978,28 @@ bool wxTextCtrl::IsEmpty() const
     if ( IsMultiLine() )
         return gtk_text_buffer_get_char_count(m_buffer) == 0;
 
     if ( IsMultiLine() )
         return gtk_text_buffer_get_char_count(m_buffer) == 0;
 

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

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

-    // the control won't be modified any more as we programmatically replace
-    // all the existing text, so reset the flag and don't set it again (and do
-    // it now, before the text event handler is ran so that IsModified() called
-    // from there returns the expected value)

     m_modified = false;
     m_modified = false;

-    DontMarkDirtyOnNextChange();

 
 

-    const wxCharBuffer buffer(wxGTK_CONV_ENC(value, GetTextEncoding()));
+    if ( !IsMultiLine() )
+    {
+        wxTextEntry::DoSetValue(value, flags);
+        return;
+    }
+
+    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
     if ( !buffer )
     {
         // see comment in WriteText() as to why we must warn the user about


@@ -949,33 +1008,27 @@ void wxTextCtrl::DoSetValue( const wxString &value, int flags )
         return;
     }
 
         return;
     }
 

-    // if the control is not empty, two "changed" signals are emitted,
-    // otherwise only one and we need to ignore either both or one of them
-    int ignore = flags & SetValue_SendEvent ? 0 : 1;
-    if ( !IsEmpty() )
-        ignore++;
+    if ( !(flags & SetValue_SendEvent) )
+    {
+        EnableTextChangedEvents(false);
+    }

 
 

-    if ( ignore )
-        IgnoreNextTextUpdate(ignore);
+    gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );

 
 

-    if ( IsMultiLine() )
+    if ( !m_defaultStyle.IsDefault() )

     {
     {

-        gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
+        GtkTextIter start, end;
+        gtk_text_buffer_get_bounds( m_buffer, &start, &end );
+        wxGtkTextApplyTagsFromAttr(m_widget, m_buffer, m_defaultStyle,
+                                   &start, &end);

     }
     }

-    else // single line
+
+    if ( !(flags & SetValue_SendEvent) )

     {
     {

-        gtk_entry_set_text( GTK_ENTRY(m_text), buffer );
+        EnableTextChangedEvents(true);

     }
 
     }
 

-    // if, for whatever reason, the callback wasn't called the expected number
-    // of times, still reset the flags to the default values
-    m_dontMarkDirty = false;
-    m_countUpdatesToIgnore = 0;
-
-
-    // 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.
+    // This was added after discussion on the list

     SetInsertionPoint(0);
 }
 
     SetInsertionPoint(0);
 }
 


@@ -983,15 +1036,21 @@ void wxTextCtrl::WriteText( const wxString &text )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-    if ( text.empty() )
+    // we're changing the text programmatically
+    DontMarkDirtyOnNextChange();
+
+    if ( !IsMultiLine() )
+    {
+        wxTextEntry::WriteText(text);

         return;
         return;

+    }

 
     // check if we have a specific style for the current position
     wxFontEncoding enc = wxFONTENCODING_SYSTEM;
     wxTextAttr style;
 
     // check if we have a specific style for the current position
     wxFontEncoding enc = wxFONTENCODING_SYSTEM;
     wxTextAttr style;

-    if ( GetStyle(GetInsertionPoint(), style) && style.HasFont() )
+    if ( GetStyle(GetInsertionPoint(), style) && style.HasFontEncoding() )

     {
     {

-        enc = style.GetFont().GetEncoding();
+        enc = style.GetFontEncoding();

     }
 
     if ( enc == wxFONTENCODING_SYSTEM )
     }
 
     if ( enc == wxFONTENCODING_SYSTEM )


@@ -1007,50 +1066,26 @@ void wxTextCtrl::WriteText( const wxString &text )
         return;
     }
 
         return;
     }
 

-    // we're changing the text programmatically
-    DontMarkDirtyOnNextChange();
-
-    if ( IsMultiLine() )
-    {
-        // 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);
+    // First remove the selection if there is one
+    // TODO:  Is there an easier GTK specific way to do this?
+    long from, to;
+    GetSelection(&from, &to);
+    if (from != to)
+        Remove(from, to);

 
 

-        // Insert the text
-        wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );
+    // Insert the text
+    wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );

 
 

-        GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(m_widget) );
-        // Scroll to cursor, but only if scrollbar thumb is at the very bottom
-        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
+    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))

     {
     {

-        // First remove the selection if there is one
-        gtk_editable_delete_selection( GTK_EDITABLE(m_text) );
-
-        // This moves the cursor pos to behind the inserted text.
-        gint len = gtk_editable_get_position(GTK_EDITABLE(m_text));
-
-        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 );
+        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 );

     }
 }
 
     }
 }
 

-void wxTextCtrl::AppendText( const wxString &text )
-{
-    SetInsertionPointEnd();
-    WriteText( text );
-}
-

 wxString wxTextCtrl::GetLineText( long lineNo ) const
 {
     wxString result;
 wxString wxTextCtrl::GetLineText( long lineNo ) const
 {
     wxString result;


@@ -1058,8 +1093,12 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
     {
         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);
+        // 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);
     }
         wxGtkString text(gtk_text_buffer_get_text(m_buffer, &line, &end, true));
         result = wxGTK_CONV_BACK(text);
     }


@@ -1153,31 +1192,7 @@ int wxTextCtrl::GetNumberOfLines() const
 {
     if ( IsMultiLine() )
     {
 {
     if ( IsMultiLine() )
     {

-        GtkTextIter iter;
-        gtk_text_buffer_get_iter_at_offset( m_buffer, &iter, 0 );
-
-        // 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++;
-        }
-
-        // 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;
+        return gtk_text_buffer_get_line_count( m_buffer );

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


@@ -1194,32 +1209,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 ( IsMultiLine() )
-    {
-        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);

     }
 }
 
     }
 }
 


@@ -1231,9 +1230,9 @@ void wxTextCtrl::SetEditable( bool editable )
     {
         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);

     }
 }
 
     }
 }
 


@@ -1245,22 +1244,15 @@ bool wxTextCtrl::Enable( bool enable )
         return false;
     }
 
         return false;
     }
 

-    if ( IsMultiLine() )
-    {
-        SetEditable( enable );
-    }
-    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


@@ -1288,9 +1280,23 @@ void wxTextCtrl::DiscardEdits()
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

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

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

+void wxTextCtrl::EnableTextChangedEvents(bool enable)
+{
+    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()
 {
     if ( m_countUpdatesToIgnore > 0 )
 bool wxTextCtrl::IgnoreTextUpdate()
 {
     if ( m_countUpdatesToIgnore > 0 )


@@ -1315,34 +1321,6 @@ bool wxTextCtrl::MarkDirtyOnChange()
     return true;
 }
 
     return true;
 }
 

-void wxTextCtrl::SetMaxLength(unsigned long len)
-{
-    if ( !HasFlag(wxTE_MULTILINE) )
-    {
-        gtk_entry_set_max_length(GTK_ENTRY(m_text), len);
-
-        // there is a bug in GTK+ 1.2.x: "changed" signal is emitted even if
-        // we had tried to enter more text than allowed by max text length and
-        // the text wasn't really changed
-        //
-        // to detect this and generate TEXT_MAXLEN event instead of
-        // TEXT_CHANGED one in this case we also catch "insert_text" signal
-        //
-        // when max len is set to 0 we disconnect our handler as it means that
-        // we shouldn't check anything any more
-        if ( len )
-        {
-            g_signal_connect (m_text, "insert_text",
-                              G_CALLBACK (gtk_insert_text_callback), this);
-        }
-        else // no checking
-        {
-            g_signal_handlers_disconnect_by_func (m_text,
-                    (gpointer) gtk_insert_text_callback, this);
-        }
-    }
-}
-

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


@@ -1362,21 +1340,25 @@ void wxTextCtrl::SetSelection( long from, long to )
         gtk_text_buffer_place_cursor( m_buffer, &toi );
         gtk_text_buffer_move_mark_by_name( m_buffer, "selection_bound", &fromi );
     }
         gtk_text_buffer_place_cursor( m_buffer, &toi );
         gtk_text_buffer_move_mark_by_name( m_buffer, "selection_bound", &fromi );
     }

-    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 ( IsMultiLine() )
+    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);

     }
 }
 
     }
 }
 


@@ -1424,7 +1406,7 @@ long wxTextCtrl::GetInsertionPoint() const
     }
     else
     {
     }
     else
     {

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

     }
 }
 
     }
 }
 


@@ -1441,9 +1423,9 @@ wxTextPos wxTextCtrl::GetLastPosition() const
 
         pos = gtk_text_iter_get_offset( &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;


@@ -1462,19 +1444,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);

     }
 }
 
     }
 }
 


@@ -1485,7 +1456,7 @@ void wxTextCtrl::Cut()
     if ( IsMultiLine() )
         g_signal_emit_by_name (m_text, "cut-clipboard");
     else
     if ( IsMultiLine() )
         g_signal_emit_by_name (m_text, "cut-clipboard");
     else

-        gtk_editable_cut_clipboard(GTK_EDITABLE(m_text));
+        wxTextEntry::Cut();

 }
 
 void wxTextCtrl::Copy()
 }
 
 void wxTextCtrl::Copy()


@@ -1495,7 +1466,7 @@ void wxTextCtrl::Copy()
     if ( IsMultiLine() )
         g_signal_emit_by_name (m_text, "copy-clipboard");
     else
     if ( IsMultiLine() )
         g_signal_emit_by_name (m_text, "copy-clipboard");
     else

-        gtk_editable_copy_clipboard(GTK_EDITABLE(m_text));
+        wxTextEntry::Copy();

 }
 
 void wxTextCtrl::Paste()
 }
 
 void wxTextCtrl::Paste()


@@ -1505,34 +1476,7 @@ void wxTextCtrl::Paste()
     if ( IsMultiLine() )
         g_signal_emit_by_name (m_text, "paste-clipboard");
     else
     if ( IsMultiLine() )
         g_signal_emit_by_name (m_text, "paste-clipboard");
     else

-        gtk_editable_paste_clipboard(GTK_EDITABLE(m_text));
-}
-
-// Undo/redo
-void wxTextCtrl::Undo()
-{
-    // TODO
-    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


@@ -1541,39 +1485,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 ( IsMultiLine() )
-     {
-         GtkTextIter ifrom, ito;
-         if ( gtk_text_buffer_get_selection_bounds(m_buffer, &ifrom, &ito) )
-         {
-             haveSelection = true;
-             from = gtk_text_iter_get_offset(&ifrom);
-             to = gtk_text_iter_get_offset(&ito);
-         }
-     }
-     else  // not multi-line
-     {
-         if ( gtk_editable_get_selection_bounds( GTK_EDITABLE(m_text),
-                                                 &from, &to) )
-         {
-             haveSelection = true;
-         }
-     }
-
-     if (! haveSelection )
-          from = to = GetInsertionPoint();
-
-     if ( from > to )
-     {
-         // exchange them to be compatible with wxMSW
-         gint tmp = from;
-         from = to;
-         to = tmp;
-     }
+    if ( !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;


@@ -1592,7 +1530,7 @@ bool wxTextCtrl::IsEditable() const
     }
     else
     {
     }
     else
     {

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

     }
 }
 
     }
 }
 


@@ -1601,11 +1539,6 @@ 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") );


@@ -1620,29 +1553,6 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event )
             if ( GetEventHandler()->ProcessEvent(event) )
                 return;
         }
             if ( GetEventHandler()->ProcessEvent(event) )
                 return;
         }

-
-        // FIXME: this is not the right place to do it, wxDialog::OnCharHook()
-        //        probably is
-        if ( IsSingleLine() )
-        {
-            // This will invoke the dialog default action, such
-            // as the clicking the default button.
-
-            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))
-            {
-                GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
-
-                if (window->default_widget)
-                {
-                    gtk_widget_activate (window->default_widget);
-                    return;
-                }
-            }
-        }

     }
 
     key_event.Skip();
     }
 
     key_event.Skip();


@@ -1754,18 +1664,12 @@ 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_widget, 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;
 }
 


@@ -1839,9 +1743,11 @@ wxSize wxTextCtrl::DoGetBestSize() const
 
 void wxTextCtrl::Freeze()
 {
 
 void wxTextCtrl::Freeze()
 {

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

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

-        if ( !m_frozenness++ )
+        if (m_freezeCount++ == 0)

         {
             // freeze textview updates and remove buffer
             g_signal_connect (m_text, "expose_event",
         {
             // freeze textview updates and remove buffer
             g_signal_connect (m_text, "expose_event",


@@ -1851,9 +1757,16 @@ void wxTextCtrl::Freeze()
             gtk_widget_set_sensitive(m_widget, false);
             g_object_ref(m_buffer);
             GtkTextBuffer* buf_new = gtk_text_buffer_new(NULL);
             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(GTK_TEXT_VIEW(m_text), buf_new);

-            // FIXME: this leaks the new buffer, since gtk_text_view_set_buffer
-            // adds its own reference, but unrefing it here can cause a crash later
+            // 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);

         }
     }
 }
         }
     }
 }


@@ -1862,9 +1775,9 @@ void wxTextCtrl::Thaw()
 {
     if ( HasFlag(wxTE_MULTILINE) )
     {
 {
     if ( HasFlag(wxTE_MULTILINE) )
     {

-        wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") );
+        wxCHECK_RET(m_freezeCount != 0, _T("Thaw() without matching Freeze()"));

 
 

-        if ( !--m_frozenness )
+        if (--m_freezeCount == 0)

         {
             // Reattach buffer and thaw textview updates
             gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), m_buffer);
         {
             // Reattach buffer and thaw textview updates
             gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), m_buffer);


@@ -1874,6 +1787,12 @@ void wxTextCtrl::Thaw()
                     (gpointer) gtk_text_exposed_callback, this);
             g_signal_handlers_disconnect_by_func (m_text,
                     (gpointer) gtk_text_exposed_callback, this);
                     (gpointer) gtk_text_exposed_callback, this);
             g_signal_handlers_disconnect_by_func (m_text,
                     (gpointer) gtk_text_exposed_callback, this);

+            if (m_showPositionOnThaw != NULL)
+            {
+                gtk_text_view_scroll_mark_onscreen(
+                    GTK_TEXT_VIEW(m_text), m_showPositionOnThaw);
+                m_showPositionOnThaw = NULL;
+            }

         }
     }
 }
         }
     }
 }


@@ -1949,3 +1868,5 @@ wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
     return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true);
 }
 {
     return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true);
 }

+
+#endif // wxUSE_TEXTCTRL