Use wxString's empty() when checking if the string is (non-)empty throughout wx.

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

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 3aeaa60599ca1ac1847737a5689c1f65747f1e0c..1aa82a3fffef5b9bc785d0179988310d7c60f83b 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        textctrl.cpp
+// Name:        src/gtk1/textctrl.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,28 +7,30 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

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

-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/log.h"
-#include "wx/settings.h"
-#include "wx/panel.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/panel.h"
+    #include "wx/settings.h"
+    #include "wx/math.h"
+#endif
+

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

+#include "wx/evtloop.h"

 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>

-#include "wx/math.h"

 
 

-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"

 #include <gdk/gdkkeysyms.h>
 
 //-----------------------------------------------------------------------------
 #include <gdk/gdkkeysyms.h>
 
 //-----------------------------------------------------------------------------


@@ -42,7 +44,6 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern bool       g_blockEventsOnDrag;

 extern wxCursor   g_globalCursor;
 extern wxWindowGTK *g_delayedFocus;
 
 extern wxCursor   g_globalCursor;
 extern wxWindowGTK *g_delayedFocus;
 


@@ -50,84 +51,27 @@ extern wxWindowGTK *g_delayedFocus;
 // helpers
 // ----------------------------------------------------------------------------
 
 // helpers
 // ----------------------------------------------------------------------------
 

-#ifdef __WXGTK20__
-static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
-                                       const wxTextAttr& attr,
-                                       GtkTextIter *start,
-                                       GtkTextIter *end)
+extern "C" {
+static void wxGtkTextInsert(GtkWidget *text,
+                            const wxTextAttr& attr,
+                            const char *txt,
+                            size_t len)

 {
 {

-    static gchar buf[1024];
-    GtkTextTag *tag;
-
+    wxFont tmpFont;
+    GdkFont *font;

     if (attr.HasFont())
     {
     if (attr.HasFont())
     {

-        char *font_string;
-        PangoFontDescription *font_description = attr.GetFont().GetNativeFontInfo()->description;
-        font_string = pango_font_description_to_string(font_description);
-        g_snprintf(buf, sizeof(buf), "WXFONT %s", font_string);
-        tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
-                                         buf );
-        if (!tag)
-            tag = gtk_text_buffer_create_tag( text_buffer, buf,
-                                              "font-desc", font_description,
-                                              NULL );
-        gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
-        g_free (font_string);
-    }
+        tmpFont = attr.GetFont();

 
 

-    if (attr.HasTextColour())
-    {
-        GdkColor *colFg = attr.GetTextColour().GetColor();
-        g_snprintf(buf, sizeof(buf), "WXFORECOLOR %d %d %d",
-                   colFg->red, colFg->green, colFg->blue);
-        tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
-                                         buf );
-        if (!tag)
-            tag = gtk_text_buffer_create_tag( text_buffer, buf,
-                                              "foreground-gdk", colFg, NULL );
-        gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
-    }
+        // FIXME: if this crashes because tmpFont goes out of scope and the GdkFont is
+        // deleted, then we need to call gdk_font_ref on font.
+        // This is because attr.GetFont() now returns a temporary font since wxTextAttr
+        // no longer stores a wxFont object, for efficiency.

 
 

-    if (attr.HasBackgroundColour())
-    {
-        GdkColor *colBg = attr.GetBackgroundColour().GetColor();
-        g_snprintf(buf, sizeof(buf), "WXBACKCOLOR %d %d %d",
-                   colBg->red, colBg->green, colBg->blue);
-        tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
-                                         buf );
-        if (!tag)
-            tag = gtk_text_buffer_create_tag( text_buffer, buf,
-                                              "background-gdk", colBg, NULL );
-        gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
+        font = tmpFont.GetInternalFont();

     }
     }

-}
-
-static void wxGtkTextInsert(GtkWidget *text,
-                            GtkTextBuffer *text_buffer,
-                            const wxTextAttr& attr,
-                            wxCharBuffer buffer)
-
-{
-    gint start_offset;
-    GtkTextIter iter, start;
-
-    gtk_text_buffer_get_iter_at_mark( text_buffer, &iter,
-                                     gtk_text_buffer_get_insert (text_buffer) );
-    start_offset = gtk_text_iter_get_offset (&iter);
-    gtk_text_buffer_insert( text_buffer, &iter, buffer, strlen(buffer) );
-
-    gtk_text_buffer_get_iter_at_offset (text_buffer, &start, start_offset);
-
-    wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter);
-}
-#else
-static void wxGtkTextInsert(GtkWidget *text,
-                            const wxTextAttr& attr,
-                            const char *txt,
-                            size_t len)
-{
-    GdkFont *font = attr.HasFont() ? attr.GetFont().GetInternalFont()
-                                   : NULL;
+    else
+        font  = NULL;

 
     GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor()
                                            : NULL;
 
     GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor()
                                            : NULL;


@@ -138,17 +82,18 @@ static void wxGtkTextInsert(GtkWidget *text,
 
     gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len );
 }
 
     gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len );
 }

-#endif // GTK 1.x
+}

 
 // ----------------------------------------------------------------------------
 // "insert_text" for GtkEntry
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // "insert_text" for GtkEntry
 // ----------------------------------------------------------------------------
 

+extern "C" {

 static void
 gtk_insert_text_callback(GtkEditable *editable,
 static void
 gtk_insert_text_callback(GtkEditable *editable,

-                         const gchar *new_text,
-                         gint new_text_length,
-                         gint *position,
+                         const gchar *WXUNUSED(new_text),
+                         gint WXUNUSED(new_text_length),
+                         gint *WXUNUSED(position),

                          wxTextCtrl *win)
 {
     if (g_isIdle)
                          wxTextCtrl *win)
 {
     if (g_isIdle)


@@ -157,7 +102,7 @@ gtk_insert_text_callback(GtkEditable *editable,
     // we should only be called if we have a max len limit at all
     GtkEntry *entry = GTK_ENTRY (editable);
 
     // 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") );
+    wxCHECK_RET( entry->text_max_length, wxT("shouldn't be called") );

 
     // check that we don't overflow the max length limit
     //
 
     // check that we don't overflow the max length limit
     //


@@ -176,16 +121,18 @@ gtk_insert_text_callback(GtkEditable *editable,
         wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, win->GetId());
         event.SetEventObject(win);
         event.SetString(win->GetValue());
         wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, win->GetId());
         event.SetEventObject(win);
         event.SetString(win->GetValue());

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

     }
 }
     }
 }

+}

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

+extern "C" {

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


@@ -196,33 +143,19 @@ gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
         wxapp_install_idle_handler();
 
     win->SetModified();
         wxapp_install_idle_handler();
 
     win->SetModified();

-#ifndef __WXGTK20__

     win->UpdateFontIfNeeded();
     win->UpdateFontIfNeeded();

-#endif // !__WXGTK20__

 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
     event.SetEventObject( win );
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
     event.SetEventObject( win );

-    event.SetString( win->GetValue() );
-    win->GetEventHandler()->ProcessEvent( event );
+    win->HandleWindowEvent( event );

 }
 }

-
-//-----------------------------------------------------------------------------
-// "expose_event" from scrolled window and textview
-//-----------------------------------------------------------------------------
-
-#ifdef __WXGTK20__
-static gboolean
-gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win )
-{
-    return TRUE;

 }
 }

-#endif

 
 //-----------------------------------------------------------------------------
 // "changed" from vertical scrollbar
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "changed" from vertical scrollbar
 //-----------------------------------------------------------------------------
 

-#ifndef __WXGTK20__
+extern "C" {

 static void
 gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
 static void
 gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {


@@ -233,48 +166,42 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 
     win->CalculateScrollbar();
 }
 
     win->CalculateScrollbar();
 }

-#endif
+}

 
 // ----------------------------------------------------------------------------
 // redraw callback for multiline text
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // redraw callback for multiline text
 // ----------------------------------------------------------------------------
 

-#ifndef __WXGTK20__
-

 // redrawing a GtkText from inside a wxYield() call results in crashes (the
 // text sample shows it in its "Add lines" command which shows wxProgressDialog
 // which implicitly calls wxYield()) so we override GtkText::draw() and simply
 // don't do anything if we're inside wxYield()
 
 // redrawing a GtkText from inside a wxYield() call results in crashes (the
 // text sample shows it in its "Add lines" command which shows wxProgressDialog
 // which implicitly calls wxYield()) so we override GtkText::draw() and simply
 // don't do anything if we're inside wxYield()
 

-extern bool wxIsInsideYield;
-

 extern "C" {
     typedef void (*GtkDrawCallback)(GtkWidget *widget, GdkRectangle *rect);
 }
 
 static GtkDrawCallback gs_gtk_text_draw = NULL;
 
 extern "C" {
     typedef void (*GtkDrawCallback)(GtkWidget *widget, GdkRectangle *rect);
 }
 
 static GtkDrawCallback gs_gtk_text_draw = NULL;
 

-extern "C"
-void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
+extern "C" {
+static void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)

 {
 {

-    if ( !wxIsInsideYield )
+    wxEventLoopBase* loop = wxEventLoopBase::GetActive();
+    if ( loop && !loop->IsYielding() )

     {
         wxCHECK_RET( gs_gtk_text_draw != wxgtk_text_draw,
     {
         wxCHECK_RET( gs_gtk_text_draw != wxgtk_text_draw,

-                     _T("infinite recursion in wxgtk_text_draw aborted") );
+                     wxT("infinite recursion in wxgtk_text_draw aborted") );

 
         gs_gtk_text_draw(widget, rect);
     }
 }
 
         gs_gtk_text_draw(widget, rect);
     }
 }

-
-#endif // __WXGTK20__
+}

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

-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)
-
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)

     EVT_CHAR(wxTextCtrl::OnChar)
 
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
     EVT_CHAR(wxTextCtrl::OnChar)
 
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)


@@ -293,13 +220,14 @@ END_EVENT_TABLE()
 void wxTextCtrl::Init()
 {
     m_ignoreNextUpdate =
 void wxTextCtrl::Init()
 {
     m_ignoreNextUpdate =

-    m_modified = FALSE;
-    SetUpdateFont(FALSE);
+    m_modified = false;
+    SetUpdateFont(false);

     m_text =
     m_text =

-    m_vScrollbar = (GtkWidget *)NULL;
-#ifdef __WXGTK20__
-    m_frozenness = 0;
-#endif 
+    m_vScrollbar = NULL;
+}
+
+wxTextCtrl::~wxTextCtrl()
+{

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


@@ -325,53 +253,28 @@ bool wxTextCtrl::Create( wxWindow *parent,
                          const wxValidator& validator,
                          const wxString &name )
 {
                          const wxValidator& validator,
                          const wxString &name )
 {

-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
+    m_needParent = true;
+    m_acceptsFocus = true;

 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxTextCtrl creation failed") );
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxTextCtrl creation failed") );

-        return FALSE;
+        return false;

     }
 
 
     }
 
 

-    m_vScrollbarVisible = FALSE;
+    m_vScrollbarVisible = false;

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

-#ifdef __WXGTK20__
-        // Create view
-        m_text = gtk_text_view_new();
-
-        m_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-
-        // create 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 );
-
-        // Insert view into scrolled window
-        gtk_container_add( GTK_CONTAINER(m_widget), m_text );
-
-        // Global settings which can be overridden by tags, I guess.
-        if (HasFlag( wxHSCROLL ) || HasFlag( wxTE_DONTWRAP ))
-            gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_NONE );
-        else
-            gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_WORD );
-
-        if (!HasFlag(wxNO_BORDER))
-            gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );
-            
-        GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
-#else

         // create our control ...
         // create our control ...

-        m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
+        m_text = gtk_text_new( NULL, NULL );

 
         // ... and put into the upper left hand corner of the table
 
         // ... and put into the upper left hand corner of the table

-        bool bHasHScrollbar = FALSE;
+        bool bHasHScrollbar = false;

         m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
         GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
         gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1,
         m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
         GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
         gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1,


@@ -389,7 +292,6 @@ bool wxTextCtrl::Create( wxWindow *parent,
                      GTK_FILL,
                      (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
                      0, 0);
                      GTK_FILL,
                      (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
                      0, 0);

-#endif

     }
     else
     {
     }
     else
     {


@@ -407,7 +309,6 @@ bool wxTextCtrl::Create( wxWindow *parent,
     if (multi_line)
         gtk_widget_show(m_text);
 
     if (multi_line)
         gtk_widget_show(m_text);
 

-#ifndef __WXGTK20__

     if (multi_line)
     {
         gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed",
     if (multi_line)
     {
         gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed",


@@ -425,14 +326,9 @@ bool wxTextCtrl::Create( wxWindow *parent,
             draw = wxgtk_text_draw;
         }
     }
             draw = wxgtk_text_draw;
         }
     }

-#endif // GTK+ 1.x

 
 

-    if (!value.IsEmpty())
+    if (!value.empty())

     {
     {

-#ifdef __WXGTK20__
-        SetValue( value );
-#else
-

 #if !GTK_CHECK_VERSION(1, 2, 0)
         // if we don't realize it, GTK 1.0.6 dies with a SIGSEGV in
         // gtk_editable_insert_text()
 #if !GTK_CHECK_VERSION(1, 2, 0)
         // if we don't realize it, GTK 1.0.6 dies with a SIGSEGV in
         // gtk_editable_insert_text()


@@ -444,7 +340,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
         wxWX2MBbuf val = value.mbc_str();
         gtk_editable_insert_text( GTK_EDITABLE(m_text), val, strlen(val), &tmp );
 #else
         wxWX2MBbuf val = value.mbc_str();
         gtk_editable_insert_text( GTK_EDITABLE(m_text), val, strlen(val), &tmp );
 #else

-        gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.length(), &tmp );

 #endif
 
         if (multi_line)
 #endif
 
         if (multi_line)


@@ -452,8 +348,6 @@ bool wxTextCtrl::Create( wxWindow *parent,
             // Bring editable's cursor uptodate. Bug in GTK.
             SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
         }
             // Bring editable's cursor uptodate. Bug in GTK.
             SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
         }

-
-#endif

     }
 
     if (style & wxTE_PASSWORD)
     }
 
     if (style & wxTE_PASSWORD)


@@ -466,69 +360,28 @@ bool wxTextCtrl::Create( wxWindow *parent,
     {
         if (!multi_line)
             gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
     {
         if (!multi_line)
             gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );

-#ifdef __WXGTK20__
-        else
-            gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
-#else

     }
     else
     {
         if (multi_line)
             gtk_text_set_editable( GTK_TEXT(m_text), 1 );
     }
     else
     {
         if (multi_line)
             gtk_text_set_editable( GTK_TEXT(m_text), 1 );

-#endif

     }
 
     }
 

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

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

-#ifdef __WXGTK20__
-    if (multi_line)
-    {
-        g_signal_connect( G_OBJECT(m_buffer), "changed",
-            GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-    }
-    else
-#endif
-    
-    {
-        gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-            GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-    }
+    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
+        GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);

 
     m_cursor = wxCursor( wxCURSOR_IBEAM );
 
     wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont());
     SetDefaultStyle( attrDef );
 
 
     m_cursor = wxCursor( wxCURSOR_IBEAM );
 
     wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont());
     SetDefaultStyle( attrDef );
 

-    return TRUE;
+    return true;

 }
 
 
 void wxTextCtrl::CalculateScrollbar()
 {
 }
 
 
 void wxTextCtrl::CalculateScrollbar()
 {

-#ifndef __WXGTK20__

     if ((m_windowStyle & wxTE_MULTILINE) == 0) return;
 
     GtkAdjustment *adj = GTK_TEXT(m_text)->vadj;
     if ((m_windowStyle & wxTE_MULTILINE) == 0) return;
 
     GtkAdjustment *adj = GTK_TEXT(m_text)->vadj;


@@ -538,7 +391,7 @@ void wxTextCtrl::CalculateScrollbar()
         if (m_vScrollbarVisible)
         {
             gtk_widget_hide( m_vScrollbar );
         if (m_vScrollbarVisible)
         {
             gtk_widget_hide( m_vScrollbar );

-            m_vScrollbarVisible = FALSE;
+            m_vScrollbarVisible = false;

         }
     }
     else
         }
     }
     else


@@ -546,41 +399,22 @@ void wxTextCtrl::CalculateScrollbar()
         if (!m_vScrollbarVisible)
         {
             gtk_widget_show( m_vScrollbar );
         if (!m_vScrollbarVisible)
         {
             gtk_widget_show( m_vScrollbar );

-            m_vScrollbarVisible = TRUE;
+            m_vScrollbarVisible = true;

         }
     }
         }
     }

-#endif

 }
 
 }
 

-wxString wxTextCtrl::GetValue() const
+wxString wxTextCtrl::DoGetValue() const

 {
 {

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

 
     wxString tmp;
     if (m_windowStyle & wxTE_MULTILINE)
     {
 
     wxString tmp;
     if (m_windowStyle & wxTE_MULTILINE)
     {

-#ifdef __WXGTK20__
-        GtkTextIter start;
-        gtk_text_buffer_get_start_iter( m_buffer, &start );
-        GtkTextIter end;
-        gtk_text_buffer_get_end_iter( m_buffer, &end );
-        gchar *text = gtk_text_buffer_get_text( m_buffer, &start, &end, TRUE );
-
-#if wxUSE_UNICODE
-        wxWCharBuffer buffer( wxConvUTF8.cMB2WX( text ) );
-#else
-        wxCharBuffer buffer( wxConvLocal.cWC2WX( wxConvUTF8.cMB2WC( text ) ) );
-#endif
-        if ( buffer )
-            tmp = buffer;
-
-        g_free( text );
-#else

         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
         tmp = text;
         g_free( text );
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
         tmp = text;
         g_free( text );

-#endif

     }
     else
     {
     }
     else
     {


@@ -590,30 +424,22 @@ wxString wxTextCtrl::GetValue() const
     return tmp;
 }
 
     return tmp;
 }
 

-void wxTextCtrl::SetValue( const wxString &value )
+void wxTextCtrl::DoSetValue( const wxString &value, int flags )

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

-    if (m_windowStyle & wxTE_MULTILINE)
+    if ( !(flags & SetValue_SendEvent) )

     {
     {

-#ifdef __WXGTK20__
-
-#if wxUSE_UNICODE
-        wxCharBuffer buffer( wxConvUTF8.cWX2MB( value) );
-#else
-        wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) );
-#endif
-        if (gtk_text_buffer_get_char_count(m_buffer) != 0)
-            IgnoreNextTextUpdate();
-
-        gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
+        // do not generate events
+        IgnoreNextTextUpdate();
+    }

 
 

-#else
+    if (m_windowStyle & wxTE_MULTILINE)
+    {

         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len );
         len = 0;
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len );
         len = 0;

-        gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.Length(), &len );
-#endif
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.length(), &len );

     }
     else
     {
     }
     else
     {


@@ -625,7 +451,7 @@ void wxTextCtrl::SetValue( const wxString &value )
     //   customize this behaviour.
     SetInsertionPoint(0);
 
     //   customize this behaviour.
     SetInsertionPoint(0);
 

-    m_modified = FALSE;
+    m_modified = false;

 }
 
 void wxTextCtrl::WriteText( const wxString &text )
 }
 
 void wxTextCtrl::WriteText( const wxString &text )


@@ -642,30 +468,6 @@ void wxTextCtrl::WriteText( const wxString &text )
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {

-#ifdef __WXGTK20__
-
-#if wxUSE_UNICODE
-        wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
-#else
-        wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
-#endif
-        if ( !buffer )
-        {
-            // what else can we do? at least don't crash...
-            return;
-        }
-
-        // TODO: Call whatever is needed to delete the selection.
-        wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );
-
-        GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(m_widget) );
-        // Scroll to cursor, but only if scrollbar thumb is at the very bottom
-        if ( adj->value == adj->upper - adj->page_size )
-        {
-            gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text),
-                    gtk_text_buffer_get_insert( m_buffer ), 0.0, FALSE, 0.0, 1.0 );
-        }
-#else // GTK 1.x

         // After cursor movements, gtk_text_get_point() is wrong by one.
         gtk_text_set_point( GTK_TEXT(m_text), GET_EDITABLE_POS(m_text) );
 
         // After cursor movements, gtk_text_get_point() is wrong by one.
         gtk_text_set_point( GTK_TEXT(m_text), GET_EDITABLE_POS(m_text) );
 


@@ -673,18 +475,17 @@ void wxTextCtrl::WriteText( const wxString &text )
         // resetting the style and appending some more text wouldn't work: if
         // we don't specify the style explicitly, the old style would be used
         gtk_editable_delete_selection( GTK_EDITABLE(m_text) );
         // resetting the style and appending some more text wouldn't work: if
         // we don't specify the style explicitly, the old style would be used
         gtk_editable_delete_selection( GTK_EDITABLE(m_text) );

-        wxGtkTextInsert(m_text, m_defaultStyle, text.c_str(), text.Len());
+        wxGtkTextInsert(m_text, m_defaultStyle, text.c_str(), text.length());

 
         // we called wxGtkTextInsert with correct font, no need to do anything
         // in UpdateFontIfNeeded() any longer
         if ( !text.empty() )
         {
 
         // we called wxGtkTextInsert with correct font, no need to do anything
         // in UpdateFontIfNeeded() any longer
         if ( !text.empty() )
         {

-            SetUpdateFont(FALSE);
+            SetUpdateFont(false);

         }
 
         // Bring editable's cursor back uptodate.
         SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
         }
 
         // Bring editable's cursor back uptodate.
         SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));

-#endif // GTK 1.x/2.0

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


@@ -694,18 +495,7 @@ void wxTextCtrl::WriteText( const wxString &text )
         // This moves the cursor pos to behind the inserted text.
         gint len = GET_EDITABLE_POS(m_text);
 
         // This moves the cursor pos to behind the inserted text.
         gint len = GET_EDITABLE_POS(m_text);
 

-#ifdef __WXGTK20__
-
-#if wxUSE_UNICODE
-        wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
-#else
-        wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
-#endif
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
-
-#else
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), text.c_str(), text.Len(), &len );
-#endif
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), text.c_str(), text.length(), &len );

 
         // Bring entry's cursor uptodate.
         gtk_entry_set_position( GTK_ENTRY(m_text), len );
 
         // Bring entry's cursor uptodate.
         gtk_entry_set_position( GTK_ENTRY(m_text), len );


@@ -724,13 +514,12 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
 {
     if (m_windowStyle & wxTE_MULTILINE)
     {
 {
     if (m_windowStyle & wxTE_MULTILINE)
     {

-#ifndef __WXGTK20__

         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
 
         if (text)
         {
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
 
         if (text)
         {

-            wxString buf(wxT(""));
+            wxString buf;

             long i;
             int currentLine = 0;
             for (i = 0; currentLine != lineNo && text[i]; i++ )
             long i;
             int currentLine = 0;
             for (i = 0; currentLine != lineNo && text[i]; i++ )


@@ -748,16 +537,6 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
         {
             return wxEmptyString;
         }
         {
             return wxEmptyString;
         }

-#else
-        GtkTextIter line;
-        gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo);
-        GtkTextIter end;
-        gtk_text_buffer_get_end_iter(m_buffer,&end );
-        gchar *text = gtk_text_buffer_get_text(m_buffer,&line,&end,TRUE);
-        wxString result(wxGTK_CONV_BACK(text));
-        g_free(text);
-        return result.BeforeFirst(wxT('\n'));
-#endif

     }
     else
     {
     }
     else
     {


@@ -780,8 +559,8 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
         wxString text = GetValue();
 
         // cast to prevent warning. But pos really should've been unsigned.
         wxString text = GetValue();
 
         // cast to prevent warning. But pos really should've been unsigned.

-        if( (unsigned long)pos > text.Len()  )
-            return FALSE;
+        if( (unsigned long)pos > text.length()  )
+            return false;

 
         *x=0;   // First Col
         *y=0;   // First Line
 
         *x=0;   // First Col
         *y=0;   // First Line


@@ -808,11 +587,11 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
         else
         {
             // index out of bounds
         else
         {
             // index out of bounds

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 long wxTextCtrl::XYToPosition(long x, long y ) const
 }
 
 long wxTextCtrl::XYToPosition(long x, long y ) const


@@ -829,16 +608,13 @@ long wxTextCtrl::XYToPosition(long x, long y ) const
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
     wxString str = GetLineText (lineNo);
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
     wxString str = GetLineText (lineNo);

-    return (int) str.Length();
+    return (int) str.length();

 }
 
 int wxTextCtrl::GetNumberOfLines() const
 {
     if (m_windowStyle & wxTE_MULTILINE)
     {
 }
 
 int wxTextCtrl::GetNumberOfLines() const
 {
     if (m_windowStyle & wxTE_MULTILINE)
     {

-#ifdef __WXGTK20__
-        return gtk_text_buffer_get_line_count( m_buffer );
-#else

         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
 
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
 


@@ -859,7 +635,6 @@ int wxTextCtrl::GetNumberOfLines() const
         {
             return 0;
         }
         {
             return 0;
         }

-#endif

     }
     else
     {
     }
     else
     {


@@ -873,16 +648,6 @@ void wxTextCtrl::SetInsertionPoint( long pos )
 
     if ( IsMultiLine() )
     {
 
     if ( IsMultiLine() )
     {

-#ifdef __WXGTK20__
-        GtkTextIter iter;
-        gtk_text_buffer_get_iter_at_offset( m_buffer, &iter, pos );
-        gtk_text_buffer_place_cursor( m_buffer, &iter );
-        gtk_text_view_scroll_mark_onscreen
-        (
-            GTK_TEXT_VIEW(m_text),
-            gtk_text_buffer_get_insert( m_buffer )
-        );
-#else // GTK+ 1.x

         gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
           GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 
         gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
           GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 


@@ -899,7 +664,6 @@ void wxTextCtrl::SetInsertionPoint( long pos )
 
         // bring editable's cursor uptodate. Bug in GTK.
         SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
 
         // bring editable's cursor uptodate. Bug in GTK.
         SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));

-#endif // GTK+ 2/1

     }
     else
     {
     }
     else
     {


@@ -916,13 +680,7 @@ void wxTextCtrl::SetInsertionPointEnd()
 
     if (m_windowStyle & wxTE_MULTILINE)
     {
 
     if (m_windowStyle & wxTE_MULTILINE)
     {

-#ifdef __WXGTK20__
-        GtkTextIter end;
-        gtk_text_buffer_get_end_iter( m_buffer, &end );
-        gtk_text_buffer_place_cursor( m_buffer, &end );
-#else

         SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text)));
         SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text)));

-#endif

     }
     else
     {
     }
     else
     {


@@ -936,11 +694,7 @@ void wxTextCtrl::SetEditable( bool editable )
 
     if (m_windowStyle & wxTE_MULTILINE)
     {
 
     if (m_windowStyle & wxTE_MULTILINE)
     {

-#ifdef __WXGTK20__
-        gtk_text_view_set_editable( GTK_TEXT_VIEW(m_text), editable );
-#else

         gtk_text_set_editable( GTK_TEXT(m_text), editable );
         gtk_text_set_editable( GTK_TEXT(m_text), editable );

-#endif

     }
     else
     {
     }
     else
     {


@@ -948,36 +702,26 @@ void wxTextCtrl::SetEditable( bool editable )
     }
 }
 
     }
 }
 

-bool wxTextCtrl::Enable( bool enable )
+void wxTextCtrl::DoEnable( bool enable )

 {
 {

-    if (!wxWindowBase::Enable(enable))
-    {
-        // nothing to do
-        return FALSE;
-    }
-

     if (m_windowStyle & wxTE_MULTILINE)
     {
     if (m_windowStyle & wxTE_MULTILINE)
     {

-#ifdef __WXGTK20__
-        SetEditable( enable );
-#else

         gtk_text_set_editable( GTK_TEXT(m_text), enable );
         gtk_text_set_editable( GTK_TEXT(m_text), enable );

-        OnParentEnable(enable);
-#endif

     }
     else
     {
         gtk_widget_set_sensitive( m_text, enable );
     }
     }
     else
     {
         gtk_widget_set_sensitive( m_text, enable );
     }

-
-    return TRUE;

 }
 
 // wxGTK-specific: called recursively by Enable,
 // to give widgets an oppprtunity to correct their colours after they
 // have been changed by Enable
 }
 
 // wxGTK-specific: called recursively by Enable,
 // to give widgets an oppprtunity to correct their colours after they
 // have been changed by Enable

-void wxTextCtrl::OnParentEnable( bool enable )
+void wxTextCtrl::OnEnabled( bool WXUNUSED(enable) )

 {
 {

+    if ( IsSingleLine() )
+        return;
+

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


@@ -995,12 +739,12 @@ void wxTextCtrl::OnParentEnable( bool enable )
 
 void wxTextCtrl::MarkDirty()
 {
 
 void wxTextCtrl::MarkDirty()
 {

-    m_modified = TRUE;
+    m_modified = true;

 }
 
 void wxTextCtrl::DiscardEdits()
 {
 }
 
 void wxTextCtrl::DiscardEdits()
 {

-    m_modified = FALSE;
+    m_modified = false;

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


@@ -1009,19 +753,19 @@ void wxTextCtrl::DiscardEdits()
 
 void wxTextCtrl::IgnoreNextTextUpdate()
 {
 
 void wxTextCtrl::IgnoreNextTextUpdate()
 {

-    m_ignoreNextUpdate = TRUE;
+    m_ignoreNextUpdate = true;

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

-        m_ignoreNextUpdate = FALSE;
+        m_ignoreNextUpdate = false;

 
 

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 void wxTextCtrl::SetMaxLength(unsigned long len)
 }
 
 void wxTextCtrl::SetMaxLength(unsigned long len)


@@ -1065,31 +809,20 @@ void wxTextCtrl::SetSelection( long from, long to )
     if (from == -1 && to == -1)
     {
         from = 0;
     if (from == -1 && to == -1)
     {
         from = 0;

-        to = GetValue().Length();
+        to = GetValue().length();

     }
 
     }
 

-#ifndef __WXGTK20__

     if ( (m_windowStyle & wxTE_MULTILINE) &&
          !GTK_TEXT(m_text)->line_start_cache )
     {
         // tell the programmer that it didn't work
     if ( (m_windowStyle & wxTE_MULTILINE) &&
          !GTK_TEXT(m_text)->line_start_cache )
     {
         // tell the programmer that it didn't work

-        wxLogDebug(_T("Can't call SetSelection() before realizing the control"));
+        wxLogDebug(wxT("Can't call SetSelection() before realizing the control"));

         return;
     }
         return;
     }

-#endif

 
     if (m_windowStyle & wxTE_MULTILINE)
     {
 
     if (m_windowStyle & wxTE_MULTILINE)
     {

-#ifdef __WXGTK20__
-        GtkTextIter fromi, toi;
-        gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from );
-        gtk_text_buffer_get_iter_at_offset( m_buffer, &toi, to );
-
-        gtk_text_buffer_place_cursor( m_buffer, &toi );
-        gtk_text_buffer_move_mark_by_name( m_buffer, "selection_bound", &fromi );
-#else

         gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
         gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );

-#endif

     }
     else
     {
     }
     else
     {


@@ -1101,13 +834,6 @@ void wxTextCtrl::ShowPosition( long pos )
 {
     if (m_windowStyle & wxTE_MULTILINE)
     {
 {
     if (m_windowStyle & wxTE_MULTILINE)
     {

-#ifdef __WXGTK20__
-        GtkTextIter iter;
-        gtk_text_buffer_get_start_iter( m_buffer, &iter );
-        gtk_text_iter_set_offset( &iter, pos );
-        GtkTextMark *mark = gtk_text_buffer_create_mark( m_buffer, NULL, &iter, TRUE );
-        gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text), mark, 0.0, FALSE, 0.0, 0.0 );
-#else // GTK 1.x

         GtkAdjustment *vp = GTK_TEXT(m_text)->vadj;
         float totalLines =  (float) GetNumberOfLines();
         long posX;
         GtkAdjustment *vp = GTK_TEXT(m_text)->vadj;
         float totalLines =  (float) GetNumberOfLines();
         long posX;


@@ -1116,65 +842,16 @@ void wxTextCtrl::ShowPosition( long pos )
         float posLine = (float) posY;
         float p = (posLine/totalLines)*(vp->upper - vp->lower) + vp->lower;
         gtk_adjustment_set_value(GTK_TEXT(m_text)->vadj, p);
         float posLine = (float) posY;
         float p = (posLine/totalLines)*(vp->upper - vp->lower) + vp->lower;
         gtk_adjustment_set_value(GTK_TEXT(m_text)->vadj, p);

-#endif // GTK 1.x/2.x

     }
 }
 
     }
 }
 

-#ifdef __WXGTK20__
-
-wxTextCtrlHitTestResult
-wxTextCtrl::HitTest(const wxPoint& pt, long *pos) const
-{
-    if ( !IsMultiLine() )
-    {
-        // not supported
-        return wxTE_HT_UNKNOWN;
-    }
-
-    int x, y;
-    gtk_text_view_window_to_buffer_coords
-    (
-        GTK_TEXT_VIEW(m_text),
-        GTK_TEXT_WINDOW_TEXT,
-        pt.x, pt.y,
-        &x, &y
-    );
-
-    GtkTextIter iter;
-    gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(m_text), &iter, x, y);
-    if ( pos )
-        *pos = gtk_text_iter_get_offset(&iter);
-
-    return wxTE_HT_ON_TEXT;
-}
-
-#endif // __WXGTK20__
-

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

-
-#ifdef __WXGTK20__
-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-        // There is no direct accessor for the cursor, but
-        // internally, the cursor is the "mark" called
-        // "insert" in the text view's btree structure.
-
-        GtkTextMark *mark = gtk_text_buffer_get_insert( m_buffer );
-        GtkTextIter cursor;
-        gtk_text_buffer_get_iter_at_mark( m_buffer, &cursor, mark );
-
-        return gtk_text_iter_get_offset( &cursor );
-    }
-    else
-#endif
-    {

     return (long) GET_EDITABLE_POS(m_text);
     return (long) GET_EDITABLE_POS(m_text);

-    }

 }
 
 }
 

-long wxTextCtrl::GetLastPosition() const
+wxTextPos wxTextCtrl::GetLastPosition() const

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


@@ -1182,14 +859,7 @@ long wxTextCtrl::GetLastPosition() const
 
     if (m_windowStyle & wxTE_MULTILINE)
     {
 
     if (m_windowStyle & wxTE_MULTILINE)
     {

-#ifdef __WXGTK20__
-        GtkTextIter end;
-        gtk_text_buffer_get_end_iter( m_buffer, &end );
-
-        pos = gtk_text_iter_get_offset( &end );
-#else

         pos = gtk_text_get_length( GTK_TEXT(m_text) );
         pos = gtk_text_get_length( GTK_TEXT(m_text) );

-#endif

     }
     else
     {
     }
     else
     {


@@ -1202,18 +872,6 @@ long wxTextCtrl::GetLastPosition() const
 void wxTextCtrl::Remove( long from, long to )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 void wxTextCtrl::Remove( long from, long to )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );

-
-#ifdef __WXGTK20__
-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-        GtkTextIter fromi, toi;
-        gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from );
-        gtk_text_buffer_get_iter_at_offset( m_buffer, &toi, to );
-
-        gtk_text_buffer_delete( m_buffer, &fromi, &toi );
-    }
-    else // single line
-#endif

     gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 }
 
     gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 }
 


@@ -1223,57 +881,34 @@ void wxTextCtrl::Replace( long from, long to, const wxString &value )
 
     Remove( from, to );
 
 
     Remove( from, to );
 

-    if (!value.IsEmpty())
+    if (!value.empty())

     {
     {

-#ifdef __WXGTK20__
-        SetInsertionPoint( from );
-        WriteText( value );
-#else // GTK 1.x

         gint pos = (gint)from;
 #if wxUSE_UNICODE
         wxWX2MBbuf buf = value.mbc_str();
         gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &pos );
 #else
         gint pos = (gint)from;
 #if wxUSE_UNICODE
         wxWX2MBbuf buf = value.mbc_str();
         gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &pos );
 #else

-        gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos );
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.length(), &pos );

 #endif // wxUSE_UNICODE
 #endif // wxUSE_UNICODE

-#endif // GTK 1.x/2.x

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

-
-#ifdef __WXGTK20__
-    if (m_windowStyle & wxTE_MULTILINE)
-        g_signal_emit_by_name(m_text, "cut-clipboard");
-    else
-#endif
-        gtk_editable_cut_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
+    gtk_editable_cut_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);

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

-
-#ifdef __WXGTK20__
-    if (m_windowStyle & wxTE_MULTILINE)
-        g_signal_emit_by_name(m_text, "copy-clipboard");
-    else
-#endif
-        gtk_editable_copy_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
+    gtk_editable_copy_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);

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

-
-#ifdef __WXGTK20__
-    if (m_windowStyle & wxTE_MULTILINE)
-        g_signal_emit_by_name(m_text, "paste-clipboard");
-    else
-#endif
-        gtk_editable_paste_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
+    gtk_editable_paste_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);

 }
 
 // Undo/redo
 }
 
 // Undo/redo


@@ -1293,14 +928,14 @@ bool wxTextCtrl::CanUndo() const
 {
     // TODO
     //wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
 {
     // TODO
     //wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );

-    return FALSE;
+    return false;

 }
 
 bool wxTextCtrl::CanRedo() const
 {
     // TODO
     //wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
 }
 
 bool wxTextCtrl::CanRedo() const
 {
     // TODO
     //wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );

-    return FALSE;
+    return false;

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


@@ -1311,35 +946,14 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
 
     gint from = -1;
     gint to = -1;
 
     gint from = -1;
     gint to = -1;

-    bool haveSelection = FALSE;
+    bool haveSelection = false;

 
 

-#ifdef __WXGTK20__
-     if (m_windowStyle & wxTE_MULTILINE)
-     {
-         GtkTextIter ifrom, ito;
-         if ( gtk_text_buffer_get_selection_bounds(m_buffer, &ifrom, &ito) )
-         {
-             haveSelection = TRUE;
-             from = gtk_text_iter_get_offset(&ifrom);
-             to = gtk_text_iter_get_offset(&ito);
-         }
-     }
-     else  // not multi-line
-     {
-         if ( gtk_editable_get_selection_bounds( GTK_EDITABLE(m_text),
-                                                 &from, &to) )
-         {
-             haveSelection = TRUE;
-         }
-     }
-#else //  not GTK2

      if ( (GTK_EDITABLE(m_text)->has_selection) )
      {
      if ( (GTK_EDITABLE(m_text)->has_selection) )
      {

-         haveSelection = TRUE;
+         haveSelection = true;

          from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
          to = (long) GTK_EDITABLE(m_text)->selection_end_pos;
      }
          from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
          to = (long) GTK_EDITABLE(m_text)->selection_end_pos;
      }

-#endif

 
      if (! haveSelection )
           from = to = GetInsertionPoint();
 
      if (! haveSelection )
           from = to = GetInsertionPoint();


@@ -1361,20 +975,8 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
 
 bool wxTextCtrl::IsEditable() const
 {
 
 bool wxTextCtrl::IsEditable() const
 {

-    wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
-
-#ifdef __WXGTK20__
-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-        return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text));
-    }
-    else
-    {
-        return gtk_editable_get_editable(GTK_EDITABLE(m_text));
-    }
-#else
+    wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );

     return GTK_EDITABLE(m_text)->editable;
     return GTK_EDITABLE(m_text)->editable;

-#endif

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


@@ -1384,19 +986,19 @@ bool wxTextCtrl::IsModified() const
 
 void wxTextCtrl::Clear()
 {
 
 void wxTextCtrl::Clear()
 {

-    SetValue( wxT("") );
+    SetValue( wxEmptyString );

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

-    if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
+    if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxTE_PROCESS_ENTER))

     {
         wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
         event.SetEventObject(this);
         event.SetString(GetValue());
     {
         wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
         event.SetEventObject(this);
         event.SetString(GetValue());

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

     }
 
     if ((key_event.GetKeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE))
     }
 
     if ((key_event.GetKeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE))


@@ -1432,11 +1034,7 @@ bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
 {
     if (m_windowStyle & wxTE_MULTILINE)
     {
 {
     if (m_windowStyle & wxTE_MULTILINE)
     {

-#ifdef __WXGTK20__
-        return window == gtk_text_view_get_window( GTK_TEXT_VIEW( m_text ), GTK_TEXT_WINDOW_TEXT );  // pure guesswork
-#else

         return (window == GTK_TEXT(m_text)->text_area);
         return (window == GTK_TEXT(m_text)->text_area);

-#endif

     }
     else
     {
     }
     else
     {


@@ -1447,103 +1045,88 @@ bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
 // the font will change for subsequent text insertiongs
 bool wxTextCtrl::SetFont( const wxFont &font )
 {
 // the font will change for subsequent text insertiongs
 bool wxTextCtrl::SetFont( const wxFont &font )
 {

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

 
     if ( !wxTextCtrlBase::SetFont(font) )
     {
         // font didn't change, nothing to do
 
     if ( !wxTextCtrlBase::SetFont(font) )
     {
         // font didn't change, nothing to do

-        return FALSE;
+        return false;

     }
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {
     }
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {

-        SetUpdateFont(TRUE);
+        SetUpdateFont(true);

 
         m_defaultStyle.SetFont(font);
 
         ChangeFontGlobally();
     }
 
 
         m_defaultStyle.SetFont(font);
 
         ChangeFontGlobally();
     }
 

-    return TRUE;
+    return true;

 }
 
 void wxTextCtrl::ChangeFontGlobally()
 {
     // this method is very inefficient and hence should be called as rarely as
     // possible!
 }
 
 void wxTextCtrl::ChangeFontGlobally()
 {
     // this method is very inefficient and hence should be called as rarely as
     // possible!

-    //
-    // TODO: it can be implemented much more efficiently for GTK2
-#ifndef __WXGTK20__

     wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont,
 
     wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont,
 

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

 
     wxString value = GetValue();
 
     wxString value = GetValue();

-    if ( !value.IsEmpty() )
+    if ( !value.empty() )

     {
     {

-        SetUpdateFont(FALSE);
+        SetUpdateFont(false);

 
         Clear();
         AppendText(value);
     }
 }
 
 
         Clear();
         AppendText(value);
     }
 }
 

-#ifndef __WXGTK20__
-

 void wxTextCtrl::UpdateFontIfNeeded()
 {
     if ( m_updateFont )
         ChangeFontGlobally();
 }
 
 void wxTextCtrl::UpdateFontIfNeeded()
 {
     if ( m_updateFont )
         ChangeFontGlobally();
 }
 

-#endif // GTK+ 1.x
-

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

-        return FALSE;
+        return false;

 
     // update default fg colour too
     m_defaultStyle.SetTextColour(colour);
 
 
     // update default fg colour too
     m_defaultStyle.SetTextColour(colour);
 

-    return TRUE;
+    return true;

 }
 
 bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 {
 }
 
 bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 {

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

 
     if ( !wxControl::SetBackgroundColour( colour ) )
 
     if ( !wxControl::SetBackgroundColour( colour ) )

-        return FALSE;
+        return false;

 
 

-#ifndef __WXGTK20__

     if (!m_widget->window)
     if (!m_widget->window)

-        return FALSE;
-#endif
+        return false;

 
     if (!m_backgroundColour.Ok())
 
     if (!m_backgroundColour.Ok())

-        return FALSE;
+        return false;

 
     if (m_windowStyle & wxTE_MULTILINE)
     {
 
     if (m_windowStyle & wxTE_MULTILINE)
     {

-#ifndef __WXGTK20__

         GdkWindow *window = GTK_TEXT(m_text)->text_area;
         if (!window)
         GdkWindow *window = GTK_TEXT(m_text)->text_area;
         if (!window)

-            return FALSE;
+            return false;

         m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
         gdk_window_set_background( window, m_backgroundColour.GetColor() );
         gdk_window_clear( window );
         m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
         gdk_window_set_background( window, m_backgroundColour.GetColor() );
         gdk_window_clear( window );

-#endif

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

-    return TRUE;
+    return true;

 }
 
 bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
 }
 
 bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )


@@ -1553,34 +1136,16 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
         if ( style.IsDefault() )
         {
             // nothing to do
         if ( style.IsDefault() )
         {
             // nothing to do

-            return TRUE;
+            return true;

         }
         }

-#ifdef __WXGTK20__
-        gint l = gtk_text_buffer_get_char_count( m_buffer );
-
-        wxCHECK_MSG( start >= 0 && end <= l, FALSE,
-                     _T("invalid range in wxTextCtrl::SetStyle") );
-
-        GtkTextIter starti, endi;
-        gtk_text_buffer_get_iter_at_offset( m_buffer, &starti, start );
-        gtk_text_buffer_get_iter_at_offset( m_buffer, &endi, end );
-
-        // use the attributes from style which are set in it and fall back
-        // first to the default style and then to the text control default
-        // colours for the others
-        wxTextAttr attr = wxTextAttr::Combine(style, m_defaultStyle, this);
-
-        wxGtkTextApplyTagsFromAttr( m_buffer, attr, &starti, &endi );

 
 

-         return TRUE;
-#else

         // VERY dirty way to do that - removes the required text and re-adds it
         // with styling (FIXME)
 
         gint l = gtk_text_get_length( GTK_TEXT(m_text) );
 
         // VERY dirty way to do that - removes the required text and re-adds it
         // with styling (FIXME)
 
         gint l = gtk_text_get_length( GTK_TEXT(m_text) );
 

-        wxCHECK_MSG( start >= 0 && end <= l, FALSE,
-                     _T("invalid range in wxTextCtrl::SetStyle") );
+        wxCHECK_MSG( start >= 0 && end <= l, false,
+                     wxT("invalid range in wxTextCtrl::SetStyle") );

 
         gint old_pos = gtk_editable_get_position( GTK_EDITABLE(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), start, end );
 
         gint old_pos = gtk_editable_get_position( GTK_EDITABLE(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), start, end );


@@ -1590,14 +1155,14 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
         gtk_editable_delete_text( GTK_EDITABLE(m_text), start, end );
         gtk_editable_set_position( GTK_EDITABLE(m_text), start );
 
         gtk_editable_delete_text( GTK_EDITABLE(m_text), start, end );
         gtk_editable_set_position( GTK_EDITABLE(m_text), start );
 

-#if wxUSE_UNICODE
+    #if wxUSE_UNICODE

         wxWX2MBbuf buf = tmp.mbc_str();
         const char *txt = buf;
         size_t txtlen = strlen(buf);
         wxWX2MBbuf buf = tmp.mbc_str();
         const char *txt = buf;
         size_t txtlen = strlen(buf);

-#else
+    #else

         const char *txt = tmp;
         size_t txtlen = tmp.length();
         const char *txt = tmp;
         size_t txtlen = tmp.length();

-#endif
+    #endif

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


@@ -1610,14 +1175,13 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
         /* does not seem to help under GTK+ 1.2 !!!
         gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */
         SetInsertionPoint( old_pos );
         /* does not seem to help under GTK+ 1.2 !!!
         gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */
         SetInsertionPoint( old_pos );

-#endif
-        return TRUE;
-    }
-    else // singe line
-    {
-        // cannot do this for GTK+'s Entry widget
-        return FALSE;
+
+        return true;

     }
     }

+
+    // else single line
+    // cannot do this for GTK+'s Entry widget
+    return false;

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


@@ -1682,8 +1246,7 @@ void wxTextCtrl::OnInternalIdle()
 
     if (cursor.Ok())
     {
 
     if (cursor.Ok())
     {

-#ifndef __WXGTK20__
-        GdkWindow *window = (GdkWindow*) NULL;
+        GdkWindow *window = NULL;

         if (HasFlag(wxTE_MULTILINE))
             window = GTK_TEXT(m_text)->text_area;
         else
         if (HasFlag(wxTE_MULTILINE))
             window = GTK_TEXT(m_text)->text_area;
         else


@@ -1698,7 +1261,6 @@ void wxTextCtrl::OnInternalIdle()
         window = m_widget->window;
         if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget)))
             gdk_window_set_cursor( window, cursor.GetCursor() );
         window = m_widget->window;
         if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget)))
             gdk_window_set_cursor( window, cursor.GetCursor() );

-#endif

     }
 
     if (g_delayedFocus == this)
     }
 
     if (g_delayedFocus == this)


@@ -1727,49 +1289,21 @@ wxSize wxTextCtrl::DoGetBestSize() const
 // freeze/thaw
 // ----------------------------------------------------------------------------
 
 // freeze/thaw
 // ----------------------------------------------------------------------------
 

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

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

-#ifdef __WXGTK20__
-        if ( !m_frozenness++ )
-        {
-            // freeze textview updates and remove buffer
-            g_signal_connect( G_OBJECT(m_text), "expose_event",
-                GTK_SIGNAL_FUNC(gtk_text_exposed_callback), (gpointer)this);
-            g_signal_connect( G_OBJECT(m_widget), "expose_event",
-                GTK_SIGNAL_FUNC(gtk_text_exposed_callback), (gpointer)this);
-            gtk_widget_set_sensitive(m_widget, false);
-            g_object_ref(m_buffer);
-            gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), gtk_text_buffer_new(NULL));
-    }
-#else

         gtk_text_freeze(GTK_TEXT(m_text));
         gtk_text_freeze(GTK_TEXT(m_text));

-#endif

     }
 }
 
     }
 }
 

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

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

-#ifdef __WXGTK20__
-        wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") );
-
-        if ( !--m_frozenness )
-        {
-            // Reattach buffer and thaw textview updates
-            gtk_text_view_set_buffer(GTK_TEXT_VIEW(m_text), m_buffer);
-            g_object_unref(m_buffer);
-            gtk_widget_set_sensitive(m_widget, true);
-            g_signal_handlers_disconnect_by_func(m_widget, (gpointer)gtk_text_exposed_callback, this);
-            g_signal_handlers_disconnect_by_func(m_text, (gpointer)gtk_text_exposed_callback, this);
-        }
-#else

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

-#endif

     }
 }
 
     }
 }
 


@@ -1782,11 +1316,7 @@ GtkAdjustment *wxTextCtrl::GetVAdj() const
     if ( !IsMultiLine() )
         return NULL;
 
     if ( !IsMultiLine() )
         return NULL;
 

-#ifdef __WXGTK20__
-    return gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(m_widget));
-#else

     return GTK_TEXT(m_text)->vadj;
     return GTK_TEXT(m_text)->vadj;

-#endif

 }
 
 bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff)
 }
 
 bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff)


@@ -1804,32 +1334,23 @@ bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff)
     if ( fabs(adj->value - value) < 0.2 )
     {
         // well, this is what Robert does in wxScrollBar, so it must be good...
     if ( fabs(adj->value - value) < 0.2 )
     {
         // well, this is what Robert does in wxScrollBar, so it must be good...

-        return FALSE;
+        return false;

     }
 
     adj->value = value;
     }
 
     adj->value = value;

-
-#ifdef __WXGTK20__
-    gtk_adjustment_value_changed(GTK_ADJUSTMENT(adj));
-#else

     gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed");
     gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed");

-#endif

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxTextCtrl::ScrollLines(int lines)
 {
     GtkAdjustment *adj = GetVAdj();
     if ( !adj )
 }
 
 bool wxTextCtrl::ScrollLines(int lines)
 {
     GtkAdjustment *adj = GetVAdj();
     if ( !adj )

-        return FALSE;
+        return false;

 
 

-#ifdef __WXGTK20__
-    int diff = (int)ceil(lines*adj->step_increment);
-#else

     // this is hardcoded to 10 in GTK+ 1.2 (great idea)
     int diff = 10*lines;
     // this is hardcoded to 10 in GTK+ 1.2 (great idea)
     int diff = 10*lines;

-#endif

 
     return DoScroll(adj, diff);
 }
 
     return DoScroll(adj, diff);
 }


@@ -1838,7 +1359,7 @@ bool wxTextCtrl::ScrollPages(int pages)
 {
     GtkAdjustment *adj = GetVAdj();
     if ( !adj )
 {
     GtkAdjustment *adj = GetVAdj();
     if ( !adj )

-        return FALSE;
+        return false;

 
     return DoScroll(adj, (int)ceil(pages*adj->page_increment));
 }
 
     return DoScroll(adj, (int)ceil(pages*adj->page_increment));
 }