adapting to init pattern

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 03d093667cb775336b593a3052f5f998c8487373..ee0c631afc6d479a065f5327612f1d9e9c2c8d4b 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


@@ -20,6 +22,7 @@
     #include "wx/math.h"
 #endif
 
     #include "wx/math.h"
 #endif
 

+#include "wx/scopeguard.h"

 #include "wx/strconv.h"
 #include "wx/fontutil.h"        // for wxNativeFontInfo (GetNativeFontInfo())
 
 #include "wx/strconv.h"
 #include "wx/fontutil.h"        // for wxNativeFontInfo (GetNativeFontInfo())
 


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


@@ -82,7 +85,9 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
     {
         wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFONT", start, end);
 
     {
         wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFONT", start, end);
 

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


@@ -93,7 +98,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 ),


@@ -145,7 +150,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);
 

-        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXALIGNMENT", start, end);
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXALIGNMENT", &para_start, &para_end);

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


@@ -191,17 +196,12 @@ 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);
 

-        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXINDENT", start, end);
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXINDENT", &para_start, &para_end);

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

-        float factor;
-#if GTK_CHECK_VERSION(2,2,0)
-        if (!gtk_check_version(2,2,0))
-            factor = (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
+        float factor =
+            (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /

                       gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;
                       gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;

-        else
-#endif
-            factor = (float)gdk_screen_width() / gdk_screen_width_mm() / 10;

 
         const int indent = (int)(factor * attr.GetLeftIndent());
         const int subIndent = (int)(factor * attr.GetLeftSubIndent());
 
         const int indent = (int)(factor * attr.GetLeftIndent());
         const int subIndent = (int)(factor * attr.GetLeftSubIndent());


@@ -240,35 +240,30 @@ 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);
 

-        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXTABS", start, end);
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXTABS", &para_start, &para_end);

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

-        wxString tagname = _T("WXTABS");
+        wxString tagname = wxT("WXTABS");

         g_snprintf(buf, sizeof(buf), "WXTABS");
         for (size_t i = 0; i < tabs.GetCount(); i++)
         g_snprintf(buf, sizeof(buf), "WXTABS");
         for (size_t i = 0; i < tabs.GetCount(); i++)

-            tagname += wxString::Format(_T(" %d"), tabs[i]);
+            tagname += wxString::Format(wxT(" %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

-            float factor;
-#if GTK_CHECK_VERSION(2,2,0)
-            if (!gtk_check_version(2,2,0))
-                factor = (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
+            float factor =
+                (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /

                           gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;
                           gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;

-            else
-#endif
-                factor = (float)gdk_screen_width() / gdk_screen_width_mm() / 10;

 
             PangoTabArray* tabArray = pango_tab_array_new(tabs.GetCount(), TRUE);
             for (size_t i = 0; i < tabs.GetCount(); i++)
                 pango_tab_array_set_tab(tabArray, i, PANGO_TAB_LEFT, (gint)(tabs[i] * factor));
 
             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);
         }
                                               "tabs", tabArray, NULL );
             pango_tab_array_free(tabArray);
         }


@@ -295,54 +290,15 @@ 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)
-{
-    // we should only be called if we have a max len limit at all
-    GtkEntry *entry = GTK_ENTRY (editable);
-
-    wxCHECK_RET( entry->text_max_length, _T("shouldn't be called") );
-
-    // check that we don't overflow the max length limit
-    //
-    // FIXME: this doesn't work when we paste a string which is going to be
-    //        truncated
-    if ( entry->text_length == entry->text_max_length )
-    {
-        // we don't need to run the base class version at all
-        g_signal_stop_emission_by_name (editable, "insert_text");
-
-        // remember that the next changed signal is to be ignored to avoid
-        // generating a dummy wxEVT_COMMAND_TEXT_UPDATED event
-        win->IgnoreNextTextUpdate();
-
-        // and generate the correct one ourselves
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, win->GetId());
-        event.SetEventObject(win);
-        event.SetString(win->GetValue());
-        win->GetEventHandler()->ProcessEvent( event );
-    }
-}
-}
-

 // Implementation of wxTE_AUTO_URL for wxGTK2 by Mart Raudsepp,
 
 extern "C" {
 static void
 au_apply_tag_callback(GtkTextBuffer *buffer,
                       GtkTextTag *tag,
 // Implementation of wxTE_AUTO_URL for wxGTK2 by Mart Raudsepp,
 
 extern "C" {
 static void
 au_apply_tag_callback(GtkTextBuffer *buffer,
                       GtkTextTag *tag,

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

 {
     if(tag == gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl"))
         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");


@@ -355,7 +311,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);
 }


@@ -363,7 +319,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);
 }


@@ -371,7 +327,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);
 }


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


@@ -395,7 +351,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://",


@@ -428,7 +384,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;
 


@@ -488,7 +444,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,


@@ -520,7 +476,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)


@@ -539,6 +495,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"


@@ -546,7 +523,7 @@ 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;


@@ -571,7 +548,7 @@ handle_text_clipboard_callback( GtkWidget *widget, wxTextCtrl *win,
 {
     wxClipboardTextEvent event( eventType, win->GetId() );
     event.SetEventObject( win );
 {
     wxClipboardTextEvent event( eventType, win->GetId() );
     event.SetEventObject( win );

-    if ( win->GetEventHandler()->ProcessEvent( event ) )
+    if ( win->HandleWindowEvent( event ) )

     {
         // don't let the default processing to take place if we did something
         // ourselves in the event handler
     {
         // don't let the default processing to take place if we did something
         // ourselves in the event handler


@@ -603,24 +580,21 @@ gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// "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, wxTextCtrlBase)
-

 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
 


@@ -657,18 +631,14 @@ void wxTextCtrl::Init()
     SetUpdateFont(false);
 
     m_text = NULL;
     SetUpdateFont(false);
 
     m_text = NULL;

-    m_freezeCount = 0;

     m_showPositionOnThaw = NULL;
     m_showPositionOnThaw = NULL;

-    m_gdkHandCursor = NULL;
-    m_gdkXTermCursor = 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_anonymousMarkList)
+        g_slist_free(m_anonymousMarkList);

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


@@ -705,10 +675,13 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
     if (multi_line)
     {
 
     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_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
+        m_text = gtk_text_view_new_with_buffer(m_buffer);
+        // gtk_text_view_set_buffer adds its own reference
+        g_object_unref(m_buffer);
+        g_signal_handler_disconnect(m_buffer, sig_id);

 
         // create "ShowPosition" marker
         GtkTextIter iter;
 
         // create "ShowPosition" marker
         GtkTextIter iter;


@@ -723,28 +696,33 @@ bool wxTextCtrl::Create( wxWindow *parent,
                                             ? GTK_POLICY_NEVER
                                             : GTK_POLICY_AUTOMATIC );
         // for ScrollLines/Pages
                                             ? GTK_POLICY_NEVER
                                             : GTK_POLICY_AUTOMATIC );
         // for ScrollLines/Pages

-        m_scrollBar[1] = (GtkRange*)((GtkScrolledWindow*)m_widget)->vscrollbar;
+        m_scrollBar[1] = GTK_RANGE(gtk_scrolled_window_get_vscrollbar(GTK_SCROLLED_WINDOW(m_widget)));

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

-        GtkScrolledWindowSetBorder(m_widget, style);
+        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)
             g_object_set (m_text, "has-frame", FALSE, NULL);
 
         if (style & wxNO_BORDER)
             g_object_set (m_text, "has-frame", FALSE, NULL);

+

     }
     }

+    g_object_ref(m_widget);

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


@@ -757,6 +735,23 @@ 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);
+    }
+
+    // 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 (!value.empty())
     {
         SetValue( value );


@@ -772,18 +767,12 @@ bool wxTextCtrl::Create( wxWindow *parent,
     if ( style & (wxTE_RIGHT | wxTE_CENTRE) )
         GTKSetJustification();
 
     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
             // don't have to check for the tag existance in callbacks,
 
             // We create our wxUrl tag here for slight efficiency gain - we
             // don't have to check for the tag existance in callbacks,


@@ -814,12 +803,14 @@ bool wxTextCtrl::Create( wxWindow *parent,
             au_check_range(&start, &end);
         }
     }
             au_check_range(&start, &end);
         }
     }

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

     }
 
     }
 

+

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


@@ -832,6 +823,18 @@ bool wxTextCtrl::Create( wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

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

 // ----------------------------------------------------------------------------
 // flags handling
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // flags handling
 // ----------------------------------------------------------------------------


@@ -847,9 +850,19 @@ void wxTextCtrl::GTKSetEditable()
 
 void wxTextCtrl::GTKSetVisibility()
 {
 
 void wxTextCtrl::GTKSetVisibility()
 {

-    // VZ: shouldn't we assert if wxTE_PASSWORD is set for multiline control?
-    if ( IsSingleLine() )
-        gtk_entry_set_visibility(GTK_ENTRY(m_text), !HasFlag(wxTE_PASSWORD));
+    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()
 }
 
 void wxTextCtrl::GTKSetWrapMode()


@@ -867,17 +880,7 @@ void wxTextCtrl::GTKSetWrapMode()
     else if ( HasFlag( wxTE_WORDWRAP ) )
         wrap = GTK_WRAP_WORD;
     else // HasFlag(wxTE_BESTWRAP) always true as wxTE_BESTWRAP == 0
     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;
-    }
+        wrap = GTK_WRAP_WORD_CHAR;

 
     gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );
 }
 
     gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );
 }


@@ -898,23 +901,16 @@ void wxTextCtrl::GTKSetJustification()
     }
     else // single line
     {
     }
     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__
-    }
+        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)
 }
 
 void wxTextCtrl::SetWindowStyleFlag(long style)


@@ -929,6 +925,9 @@ void wxTextCtrl::SetWindowStyleFlag(long style)
     if ( (style & wxTE_PASSWORD) != (styleOld & wxTE_PASSWORD) )
         GTKSetVisibility();
 
     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 flagsWrap = wxTE_WORDWRAP | wxTE_CHARWRAP | wxTE_DONTWRAP;
     if ( (style & flagsWrap) != (styleOld & flagsWrap) )
         GTKSetWrapMode();


@@ -946,7 +945,6 @@ wxString wxTextCtrl::GetValue() const
 {
     wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );
 
 {
     wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );
 

-    wxString tmp;

     if ( IsMultiLine() )
     {
         GtkTextIter start;
     if ( IsMultiLine() )
     {
         GtkTextIter start;


@@ -957,13 +955,10 @@ wxString wxTextCtrl::GetValue() const
 
         return wxGTK_CONV_BACK(text);
     }
 
         return wxGTK_CONV_BACK(text);
     }

-    else
+    else // single line

     {
     {

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

     }
     }

-
-    return tmp;

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


@@ -974,7 +969,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


@@ -989,20 +984,37 @@ 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();

 
 

+    if ( !IsMultiLine() )
+    {
+        wxTextEntry::DoSetValue(value, flags);
+        return;
+    }
+
+    if (value.IsEmpty())
+    {
+        if ( !(flags & SetValue_SendEvent) )
+            EnableTextChangedEvents(false);
+
+        gtk_text_buffer_set_text( m_buffer, "", 0 );
+
+        if ( !(flags & SetValue_SendEvent) )
+            EnableTextChangedEvents(true);
+
+        return;
+    }
+
+#if wxUSE_UNICODE
+    const wxCharBuffer buffer(value.utf8_str());
+#else

     wxFontEncoding enc = m_defaultStyle.HasFont()
                             ? m_defaultStyle.GetFont().GetEncoding()
                             : wxFONTENCODING_SYSTEM;
     wxFontEncoding enc = m_defaultStyle.HasFont()
                             ? m_defaultStyle.GetFont().GetEncoding()
                             : wxFONTENCODING_SYSTEM;


@@ -1017,58 +1029,51 @@ void wxTextCtrl::DoSetValue( const wxString &value, int flags )
         wxLogWarning(_("Failed to set text in the text control."));
         return;
     }
         wxLogWarning(_("Failed to set text in the text control."));
         return;
     }

+#endif

 
 

-    // 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) );
-
-        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);
-        }
+        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.
-    SetInsertionPoint(0);

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

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

         return;
         return;

+    }

 
 

+#if wxUSE_UNICODE
+    const wxCharBuffer buffer(text.utf8_str());
+#else

     // check if we have a specific style for the current position
     wxFontEncoding enc = wxFONTENCODING_SYSTEM;
     wxTextAttr style;
     // 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 )


@@ -1083,50 +1088,32 @@ void wxTextCtrl::WriteText( const wxString &text )
         wxLogWarning(_("Failed to insert text in the control."));
         return;
     }
         wxLogWarning(_("Failed to insert text in the control."));
         return;
     }

+#endif

 
 

-    // 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);
-
-        // Insert the text
-        wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );
-
-        GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(m_widget) );
-        // Scroll to cursor, but only if scrollbar thumb is at the very bottom
-        // won't work when frozen, text view is not using m_buffer then
-        if (!IsFrozen() && wxIsSameDouble(adj->value, adj->upper - adj->page_size))
+    // 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 );
+
+    // 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))

         {
         {

-            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 );
+            gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(m_text),
+                gtk_text_buffer_get_insert(m_buffer), 0, false, 0, 1);

         }
     }
         }
     }

-    else // single line
-    {
-        // 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 );
-    }
-}
-
-void wxTextCtrl::AppendText( const wxString &text )
-{
-    SetInsertionPointEnd();
-    WriteText( text );

 }
 
 wxString wxTextCtrl::GetLineText( long lineNo ) const
 }
 
 wxString wxTextCtrl::GetLineText( long lineNo ) const


@@ -1178,7 +1165,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
     }
     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)))

         {
             if ( y )
                 *y = 0;
         {
             if ( y )
                 *y = 0;


@@ -1259,18 +1246,12 @@ void wxTextCtrl::SetInsertionPoint( long pos )
         else
             gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(m_text), mark);
     }
         else
             gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(m_text), mark);
     }

-    else
+    else // single line

     {
     {

-        // FIXME: Is the editable's cursor really uptodate without double set_position in GTK2?
-        gtk_editable_set_position(GTK_EDITABLE(m_text), int(pos));
+        wxTextEntry::SetInsertionPoint(pos);

     }
 }
 
     }
 }
 

-void wxTextCtrl::SetInsertionPointEnd()
-{
-    SetInsertionPoint(-1);
-}
-

 void wxTextCtrl::SetEditable( bool editable )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 void wxTextCtrl::SetEditable( bool editable )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );


@@ -1279,9 +1260,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);

     }
 }
 
     }
 }
 


@@ -1293,14 +1274,8 @@ 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 );
+    SetCursor(enable ? wxCursor(wxCURSOR_IBEAM) : wxCursor());

 
     return true;
 }
 
     return true;
 }


@@ -1308,13 +1283,13 @@ bool wxTextCtrl::Enable( bool enable )
 // wxGTK-specific: called recursively by Enable,
 // to give widgets an opportunity to correct their colours after they
 // have been changed by Enable
 // wxGTK-specific: called recursively by Enable,
 // to give widgets an opportunity to correct their colours after they
 // have been changed by Enable

-void wxTextCtrl::OnEnabled( bool enable )
+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
     // text.
     wxColour oldColour = GetBackgroundColour();
 {
     // 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())
+    if (oldColour.IsOk())

     {
         // Need to set twice or it'll optimize the useful stuff out
         if (oldColour == * wxWHITE)
     {
         // Need to set twice or it'll optimize the useful stuff out
         if (oldColour == * wxWHITE)


@@ -1336,9 +1311,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 )


@@ -1363,56 +1352,27 @@ 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") );
 

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

     if ( IsMultiLine() )
     {
     if ( IsMultiLine() )
     {

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

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

     }
 }
 
     }
 }
 


@@ -1476,7 +1436,7 @@ long wxTextCtrl::GetInsertionPoint() const
     }
     else
     {
     }
     else
     {

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

     }
 }
 
     }
 }
 


@@ -1493,9 +1453,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;


@@ -1514,19 +1474,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);

     }
 }
 
     }
 }
 


@@ -1537,7 +1486,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()


@@ -1547,7 +1496,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()


@@ -1557,34 +1506,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


@@ -1593,39 +1515,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;


@@ -1644,7 +1560,7 @@ bool wxTextCtrl::IsEditable() const
     }
     else
     {
     }
     else
     {

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

     }
 }
 
     }
 }
 


@@ -1653,11 +1569,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") );


@@ -1669,32 +1580,9 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event )
             wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
             event.SetEventObject(this);
             event.SetString(GetValue());
             wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
             event.SetEventObject(this);
             event.SetString(GetValue());

-            if ( GetEventHandler()->ProcessEvent(event) )
+            if ( HandleWindowEvent(event) )

                 return;
         }
                 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();


@@ -1714,7 +1602,7 @@ GdkWindow *wxTextCtrl::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
     }
     else
     {
     }
     else
     {

-        return GTK_ENTRY(m_text)->text_area;
+        return gtk_entry_get_text_window(GTK_ENTRY(m_text));

     }
 }
 
     }
 }
 


@@ -1748,7 +1636,7 @@ void wxTextCtrl::ChangeFontGlobally()
     //
     // TODO: it can be implemented much more efficiently for GTK2
     wxASSERT_MSG( IsMultiLine(),
     //
     // TODO: it can be implemented much more efficiently for GTK2
     wxASSERT_MSG( IsMultiLine(),

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

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


@@ -1778,7 +1666,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


@@ -1800,7 +1688,7 @@ 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 );
 
         GtkTextIter starti, endi;
         gtk_text_buffer_get_iter_at_offset( m_buffer, &starti, start );


@@ -1815,6 +1703,50 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
     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( g_free, 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)
 {
     gtk_widget_modify_style(m_text, style);
 void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     gtk_widget_modify_style(m_text, style);


@@ -1883,60 +1815,62 @@ wxSize wxTextCtrl::DoGetBestSize() const
 // freeze/thaw
 // ----------------------------------------------------------------------------
 
 // freeze/thaw
 // ----------------------------------------------------------------------------
 

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

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

+    wxWindow::DoFreeze();
+

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

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

         {
         {

-            // freeze textview updates and remove buffer
-            g_signal_connect (m_text, "expose_event",
-                              G_CALLBACK (gtk_text_exposed_callback), this);
-            g_signal_connect (m_widget, "expose_event",
-                              G_CALLBACK (gtk_text_exposed_callback), this);
-            gtk_widget_set_sensitive(m_widget, false);
-            g_object_ref(m_buffer);
-            GtkTextBuffer* buf_new = gtk_text_buffer_new(NULL);
-            GtkTextMark* mark = GTK_TEXT_VIEW(m_text)->first_para_mark;
-            gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), buf_new);
-            // gtk_text_view_set_buffer adds its own reference
-            g_object_unref(buf_new);
-            // This mark should be deleted when the buffer is changed,
-            // but it's not (in GTK+ up to at least 2.10.6).
-            // Otherwise these anonymous marks start to build up in the buffer,
-            // and Freeze takes longer and longer each time it is called.
-            if (GTK_IS_TEXT_MARK(mark) && !gtk_text_mark_get_deleted(mark))
-                gtk_text_buffer_delete_mark(m_buffer, mark);
+            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) )
     {

-        wxCHECK_RET(m_freezeCount != 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_freezeCount == 0)
+        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);
-            if (m_showPositionOnThaw != NULL)
-            {
-                gtk_text_view_scroll_mark_onscreen(
-                    GTK_TEXT_VIEW(m_text), m_showPositionOnThaw);
-                m_showPositionOnThaw = NULL;
-            }
+            gtk_text_view_scroll_mark_onscreen(
+                GTK_TEXT_VIEW(m_text), m_showPositionOnThaw);
+            m_showPositionOnThaw = NULL;

         }
         }

+
+        // and thaw the window
+        GTKThawWidget(m_text);

     }
     }

+
+    wxWindow::DoThaw();

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


@@ -1963,13 +1897,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))


@@ -1988,8 +1920,8 @@ 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 wxTextCtrl::GTKProcessEvent(wxEvent& event) const


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

+
+#endif // wxUSE_TEXTCTRL