X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3883022093c42e3fb7b248ea2cb4bbd1e056a75b..cece1d88c00e2ae4398bf87073879187f5ca54c5:/src/gtk1/textctrl.cpp

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 7e283a82d9..ec25530e46 100644
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -14,11 +14,14 @@
 #include "wx/textctrl.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
+#include "wx/log.h"
 #include "wx/settings.h"
+#include "wx/panel.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
+#include <math.h>               // for fabs
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
@@ -35,7 +38,48 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
-extern bool   g_blockEventsOnDrag;
+extern bool       g_blockEventsOnDrag;
+extern wxCursor   g_globalCursor;
+
+// ----------------------------------------------------------------------------
+// "insert_text" for GtkEntry
+// ----------------------------------------------------------------------------
+
+static void
+gtk_insert_text_callback(GtkEditable *editable,
+                         const gchar *new_text,
+                         gint new_text_length,
+                         gint *position,
+                         wxTextCtrl *win)
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    // we should only be called if we have a max len limit at all
+    GtkEntry *entry = GTK_ENTRY (editable);
+
+    wxCHECK_RET( entry->text_max_length, _T("shouldn't be called") );
+
+    // check that we don't overflow the max length limit
+    //
+    // FIXME: this doesn't work when we paste a string which is going to be
+    //        truncated
+    if ( entry->text_length == entry->text_max_length )
+    {
+        // we don't need to run the base class version at all
+        gtk_signal_emit_stop_by_name(GTK_OBJECT(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 );
+    }
+}
 
 //-----------------------------------------------------------------------------
 //  "changed"
@@ -44,16 +88,20 @@ extern bool   g_blockEventsOnDrag;
 static void
 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
+    if ( win->IgnoreTextUpdate() )
+        return;
+
     if (!win->m_hasVMT) return;
 
-    if (g_isIdle) 
+    if (g_isIdle)
         wxapp_install_idle_handler();
 
     win->SetModified();
+    win->UpdateFontIfNeeded();
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
-    event.SetString( win->GetValue() );
     event.SetEventObject( win );
+    event.SetString( win->GetValue() );
     win->GetEventHandler()->ProcessEvent( event );
 }
 
@@ -65,8 +113,8 @@ static void
 gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
     if (!win->m_hasVMT) return;
-    
-    if (g_isIdle) 
+
+    if (g_isIdle)
         wxapp_install_idle_handler();
 
     win->CalculateScrollbar();
@@ -94,61 +142,61 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 END_EVENT_TABLE()
 
-#if wxUSE_STD_IOSTREAM
-wxTextCtrl::wxTextCtrl() : streambuf()
+void wxTextCtrl::Init()
 {
-    if (allocate()) setp(base(),ebuf());
-
+    m_ignoreNextUpdate =
     m_modified = FALSE;
+    m_updateFont = FALSE;
+    m_text =
+    m_vScrollbar = (GtkWidget *)NULL;
 }
-#else
-wxTextCtrl::wxTextCtrl()
-{
-    m_modified = FALSE;
-}
-#endif
 
-#if wxUSE_STD_IOSTREAM
-wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
-      const wxPoint &pos, const wxSize &size,
-      int style, const wxValidator& validator, const wxString &name ) : streambuf()
+wxTextCtrl::wxTextCtrl( wxWindow *parent,
+                        wxWindowID id,
+                        const wxString &value,
+                        const wxPoint &pos,
+                        const wxSize &size,
+                        long style,
+                        const wxValidator& validator,
+                        const wxString &name )
 {
-    if (allocate()) setp(base(),ebuf());
+    Init();
 
-    m_modified = FALSE;
     Create( parent, id, value, pos, size, style, validator, name );
 }
-#else
-wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
-      const wxPoint &pos, const wxSize &size,
-      int style, const wxValidator& validator, const wxString &name )
-{
-    m_modified = FALSE;
-    Create( parent, id, value, pos, size, style, validator, name );
-}
-#endif
 
-bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
-      const wxPoint &pos, const wxSize &size,
-      int style, const wxValidator& validator, const wxString &name )
+bool wxTextCtrl::Create( wxWindow *parent,
+                         wxWindowID id,
+                         const wxString &value,
+                         const wxPoint &pos,
+                         const wxSize &size,
+                         long style,
+                         const wxValidator& validator,
+                         const wxString &name )
 {
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 
-    PreCreation( parent, id, pos, size, style, name );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxTextCtrl creation failed") );
+        return FALSE;
+    }
 
-#if wxUSE_VALIDATORS
-    SetValidator( validator );
-#endif // wxUSE_VALIDATORS
 
     m_vScrollbarVisible = FALSE;
 
     bool multi_line = (style & wxTE_MULTILINE) != 0;
     if (multi_line)
     {
+#if (GTK_MINOR_VERSION > 2)
         /* a multi-line edit control: create a vertical scrollbar by default and
            horizontal if requested */
         bool bHasHScrollbar = (style & wxHSCROLL) != 0;
+#else
+        bool bHasHScrollbar = FALSE;
+#endif
 
         /* create our control ... */
         m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
@@ -160,10 +208,11 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
                       (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
                       (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
                        0, 0);
-		       
+
         /* always wrap words */
         gtk_text_set_word_wrap( GTK_TEXT(m_text), TRUE );
-	
+
+#if (GTK_MINOR_VERSION > 2)
         /* put the horizontal scrollbar in the lower left hand corner */
         if (bHasHScrollbar)
         {
@@ -175,12 +224,11 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
                        0, 0);
             gtk_widget_show(hscrollbar);
 
-#if (GTK_MINOR_VERSION > 0)
             /* don't wrap lines, otherwise we wouldn't need the scrollbar */
             gtk_text_set_line_wrap( GTK_TEXT(m_text), FALSE );
-#endif
         }
-	
+#endif
+
         /* finally, put the vertical scrollbar in the upper right corner */
         m_vScrollbar = gtk_vscrollbar_new( GTK_TEXT(m_text)->vadj );
         GTK_WIDGET_UNSET_FLAGS( m_vScrollbar, GTK_CAN_FOCUS );
@@ -196,22 +244,26 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
           m_text = gtk_entry_new();
     }
 
-    wxSize newSize = size;
-    if (newSize.x == -1) newSize.x = 80;
-    if (newSize.y == -1) newSize.y = 26;
-    SetSize( newSize.x, newSize.y );
-
     m_parent->DoAddChild( this );
+    
+    m_focusWidget = m_text;
 
     PostCreation();
 
+    SetFont( parent->GetFont() );
+
+    wxSize size_best( DoGetBestSize() );
+    wxSize new_size( size );
+    if (new_size.x == -1)
+        new_size.x = size_best.x;
+    if (new_size.y == -1)
+        new_size.y = size_best.y;
+    if ((new_size.x != size.x) || (new_size.y != size.y))
+        SetSize( new_size.x, new_size.y );
+
     if (multi_line)
         gtk_widget_show(m_text);
 
-    /* we want to be notified about text changes */
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-
     if (multi_line)
     {
         gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed",
@@ -260,8 +312,21 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
             gtk_text_set_editable( GTK_TEXT(m_text), 1 );
     }
 
-    SetBackgroundColour( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) );
-    SetForegroundColour( parent->GetForegroundColour() );
+    /* we want to be notified about text changes */
+    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+
+    /* we don't set a valid background colour, because the window
+       manager should use a default one */
+    m_backgroundColour = wxColour();
+
+    wxColour colFg = parent->GetForegroundColour();
+    SetForegroundColour( colFg );
+
+    m_cursor = wxCursor( wxCURSOR_IBEAM );
+
+    wxTextAttr attrDef( colFg, m_backgroundColour, parent->GetFont() );
+    SetDefaultStyle( attrDef );
 
     Show( TRUE );
 
@@ -294,7 +359,7 @@ void wxTextCtrl::CalculateScrollbar()
 
 wxString wxTextCtrl::GetValue() const
 {
-    wxCHECK_MSG( m_text != NULL, _T(""), _T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, wxT(""), wxT("invalid text ctrl") );
 
     wxString tmp;
     if (m_windowStyle & wxTE_MULTILINE)
@@ -313,68 +378,84 @@ wxString wxTextCtrl::GetValue() const
 
 void wxTextCtrl::SetValue( const wxString &value )
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-      
-    wxString tmp = _T("");
-    if (!value.IsNull()) tmp = value;
     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;
 #if wxUSE_UNICODE
-        wxWX2MBbuf tmpbuf = tmp.mbc_str();
+        wxWX2MBbuf tmpbuf = value.mbc_str();
         gtk_editable_insert_text( GTK_EDITABLE(m_text), tmpbuf, strlen(tmpbuf), &len );
 #else
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), tmp.mbc_str(), tmp.Length(), &len );
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.Length(), &len );
 #endif
     }
     else
     {
-        gtk_entry_set_text( GTK_ENTRY(m_text), tmp.mbc_str() );
+        gtk_entry_set_text( GTK_ENTRY(m_text), value.mbc_str() );
     }
-    
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+
+    // GRG, Jun/2000: Changed this after a lot of discussion in
+    //   the lists. wxWindows 2.2 will have a set of flags to
+    //   customize this behaviour.
+    SetInsertionPoint(0);
+
+    m_modified = FALSE;
 }
 
 void wxTextCtrl::WriteText( const wxString &text )
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
-    if (text.IsEmpty()) return;
+    if ( text.empty() )
+        return;
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-      
-    if (m_windowStyle & wxTE_MULTILINE)
+#if wxUSE_UNICODE
+    wxWX2MBbuf buf = text.mbc_str();
+    const char *txt = buf;
+    size_t txtlen = strlen(buf);
+#else
+    const char *txt = text;
+    size_t txtlen = text.length();
+#endif
+
+    if ( m_windowStyle & wxTE_MULTILINE )
     {
         /* this moves the cursor pos to behind the inserted text */
         gint len = GTK_EDITABLE(m_text)->current_pos;
 
-#if wxUSE_UNICODE
-        wxWX2MBbuf buf = text.mbc_str();
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len );
-#else
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
-#endif
+        // if we have any special style, use it
+        if ( !m_defaultStyle.IsDefault() )
+        {
+            GdkFont *font = m_defaultStyle.HasFont()
+                                ? m_defaultStyle.GetFont().GetInternalFont()
+                                : NULL;
+
+            GdkColor *colFg = m_defaultStyle.HasTextColour()
+                                ? m_defaultStyle.GetTextColour().GetColor()
+                                : NULL;
+
+            GdkColor *colBg = m_defaultStyle.HasBackgroundColour()
+                                ? m_defaultStyle.GetBackgroundColour().GetColor()
+                                : NULL;
+
+            gtk_text_insert( GTK_TEXT(m_text), font, colFg, colBg, txt, txtlen );
+        }
+        else // no style
+        {
+            gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len );
+        }
 
         /* bring editable's cursor uptodate. bug in GTK. */
         GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
     }
-    else
+    else // single line
     {
         /* this moves the cursor pos to behind the inserted text */
         gint len = GTK_EDITABLE(m_text)->current_pos;
-#if wxUSE_UNICODE
-        wxWX2MBbuf buf = text.mbc_str();
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len );
-#else
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
-#endif
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len );
 
         /* bring editable's cursor uptodate. bug in GTK. */
         GTK_EDITABLE(m_text)->current_pos += text.Len();
@@ -382,143 +463,58 @@ void wxTextCtrl::WriteText( const wxString &text )
         /* bring entry's cursor uptodate. bug in GTK. */
         gtk_entry_set_position( GTK_ENTRY(m_text), GTK_EDITABLE(m_text)->current_pos );
     }
-    
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 }
 
 void wxTextCtrl::AppendText( const wxString &text )
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
-    if (text.IsEmpty()) return;
+    if ( text.empty() )
+        return;
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-      
-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-        /* we'll insert at the last position */
-        gint len = gtk_text_get_length( GTK_TEXT(m_text) );
 #if wxUSE_UNICODE
-        wxWX2MBbuf buf = text.mbc_str();
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len );
+    wxWX2MBbuf buf = text.mbc_str();
+    const char *txt = buf;
+    size_t txtlen = strlen(buf);
 #else
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
+    const char *txt = text;
+    size_t txtlen = text.length();
 #endif
 
-        /* bring editable's cursor uptodate. bug in GTK. */
-        GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
-    }
-    else
-    {
-        gtk_entry_append_text( GTK_ENTRY(m_text), text.mbc_str() );
-    }
-    
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-}
-
-bool wxTextCtrl::LoadFile( const wxString &file )
-{
-    wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") );
-
-    if (!wxFileExists(file)) return FALSE;
-
-    Clear();
-
-    FILE *fp = (FILE*) NULL;
-    struct stat statb;
-
-    if ((stat (FNSTRINGCAST file.fn_str(), &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||
-        !(fp = fopen (FNSTRINGCAST file.fn_str(), "r")))
-    {
-        return FALSE;
-    }
-    else
+    if (m_windowStyle & wxTE_MULTILINE)
     {
-        gint len = statb.st_size;
-        char *text;
-        if (!(text = (char*)malloc ((unsigned) (len + 1))))
-        {
-            fclose (fp);
-            return FALSE;
-        }
-        if (fread (text, sizeof (char), len, fp) != (size_t) len)
+        if ( !m_defaultStyle.IsDefault() )
         {
-        }
-        fclose (fp);
+            wxFont font = m_defaultStyle.HasFont() ? m_defaultStyle.GetFont()
+                                                   : m_font;
+            GdkFont *fnt = font.Ok() ? font.GetInternalFont() : NULL;
 
-        text[len] = 0;
+            wxColour col = m_defaultStyle.HasTextColour()
+                                ? m_defaultStyle.GetTextColour()
+                                : m_foregroundColour;
+            GdkColor *colFg = col.Ok() ? col.GetColor() : NULL;
 
-        gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-      
-        if (m_windowStyle & wxTE_MULTILINE)
-        {
-            gint pos = 0;
-            gtk_editable_insert_text( GTK_EDITABLE(m_text), text, len, &pos );
+            col = m_defaultStyle.HasBackgroundColour()
+                    ? m_defaultStyle.GetBackgroundColour()
+                    : m_backgroundColour;
+            GdkColor *colBg = col.Ok() ? col.GetColor() : NULL;
+
+            gtk_text_insert( GTK_TEXT(m_text), fnt, colFg, colBg, txt, txtlen );
         }
-        else
+        else // no style
         {
-            gtk_entry_set_text( GTK_ENTRY(m_text), text );
+            /* we'll insert at the last position */
+            gint len = gtk_text_get_length( GTK_TEXT(m_text) );
+            gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len );
         }
-    
-        gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-      
-        free (text);
-        m_modified = FALSE;
-        return TRUE;
-    }
-    return FALSE;
-}
-
-bool wxTextCtrl::SaveFile( const wxString &file )
-{
-    wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") );
-
-    if (file == _T("")) return FALSE;
-
-    FILE *fp;
 
-    if (!(fp = fopen (FNSTRINGCAST file.fn_str(), "w")))
-    {
-        return FALSE;
+        /* bring editable's cursor uptodate. bug in GTK. */
+        GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
     }
-    else
+    else // single line
     {
-      char *text = (char*) NULL;
-      gint len = 0;
-
-      if (m_windowStyle & wxTE_MULTILINE)
-      {
-          len = gtk_text_get_length( GTK_TEXT(m_text) );
-          text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
-      }
-      else
-      {
-          text = gtk_entry_get_text( GTK_ENTRY(m_text) );
-      }
-
-      if (fwrite (text, sizeof (char), len, fp) != (size_t) len)
-      {
-          // Did not write whole file
-      }
-
-      // Make sure newline terminates the file
-      if (text[len - 1] != '\n')
-          fputc ('\n', fp);
-
-      fclose (fp);
-
-      if (m_windowStyle & wxTE_MULTILINE) g_free( text );
-
-      m_modified = FALSE;
-      return TRUE;
+        gtk_entry_append_text( GTK_ENTRY(m_text), txt );
     }
-
-    return TRUE;
 }
 
 wxString wxTextCtrl::GetLineText( long lineNo ) const
@@ -530,7 +526,7 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
 
     if (text)
     {
-        wxString buf(_T(""));
+        wxString buf(wxT(""));
         long i;
         int currentLine = 0;
         for (i = 0; currentLine != lineNo && text[i]; i++ )
@@ -558,10 +554,10 @@ void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
 {
   /* If you implement this, don't forget to update the documentation!
    * (file docs/latex/wx/text.tex) */
-    wxFAIL_MSG( _T("wxTextCtrl::OnDropFiles not implemented") );
+    wxFAIL_MSG( wxT("wxTextCtrl::OnDropFiles not implemented") );
 }
 
-long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
+bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
 {
     if ( m_windowStyle & wxTE_MULTILINE )
     {
@@ -577,7 +573,7 @@ long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
         const wxChar* stop = text.c_str() + pos;
         for ( const wxChar *p = text.c_str(); p < stop; p++ )
         {
-            if (*p == _T('\n'))
+            if (*p == wxT('\n'))
             {
                 (*y)++;
                 *x=0;
@@ -653,7 +649,7 @@ int wxTextCtrl::GetNumberOfLines() const
 
 void wxTextCtrl::SetInsertionPoint( long pos )
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
     if (m_windowStyle & wxTE_MULTILINE)
     {
@@ -684,13 +680,13 @@ void wxTextCtrl::SetInsertionPoint( long pos )
 
         /* bring editable's cursor uptodate. bug in GTK. */
 
-        GTK_EDITABLE(m_text)->current_pos = pos;
+        GTK_EDITABLE(m_text)->current_pos = (guint32)pos;
     }
 }
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
     if (m_windowStyle & wxTE_MULTILINE)
         SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text)));
@@ -700,7 +696,7 @@ void wxTextCtrl::SetInsertionPointEnd()
 
 void wxTextCtrl::SetEditable( bool editable )
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
     if (m_windowStyle & wxTE_MULTILINE)
         gtk_text_set_editable( GTK_TEXT(m_text), editable );
@@ -708,9 +704,118 @@ void wxTextCtrl::SetEditable( bool editable )
         gtk_entry_set_editable( GTK_ENTRY(m_text), editable );
 }
 
+bool wxTextCtrl::Enable( bool enable )
+{
+    if (!wxWindowBase::Enable(enable))
+    {
+        // nothing to do
+        return FALSE;
+    }
+
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+        gtk_text_set_editable( GTK_TEXT(m_text), enable );
+        OnParentEnable(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
+void wxTextCtrl::OnParentEnable( bool enable )
+{
+    // If we have a custom background colour, we use this colour in both
+    // disabled and enabled mode, or we end up with a different colour under the
+    // text.
+    wxColour oldColour = GetBackgroundColour();
+    if (oldColour.Ok())
+    {
+        // Need to set twice or it'll optimize the useful stuff out
+        if (oldColour == * wxWHITE)
+            SetBackgroundColour(*wxBLACK);
+        else
+            SetBackgroundColour(*wxWHITE);
+        SetBackgroundColour(oldColour);
+    }
+}
+
+void wxTextCtrl::DiscardEdits()
+{
+    m_modified = FALSE;
+}
+
+// ----------------------------------------------------------------------------
+// max text length support
+// ----------------------------------------------------------------------------
+
+void wxTextCtrl::IgnoreNextTextUpdate()
+{
+    m_ignoreNextUpdate = TRUE;
+}
+
+bool wxTextCtrl::IgnoreTextUpdate()
+{
+    if ( m_ignoreNextUpdate )
+    {
+        m_ignoreNextUpdate = FALSE;
+
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+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 )
+        {
+            gtk_signal_connect( GTK_OBJECT(m_text),
+                                "insert_text",
+                                GTK_SIGNAL_FUNC(gtk_insert_text_callback),
+                                (gpointer)this);
+        }
+        else // no checking
+        {
+            gtk_signal_disconnect_by_func
+            (
+                GTK_OBJECT(m_text),
+                GTK_SIGNAL_FUNC(gtk_insert_text_callback),
+                (gpointer)this
+            );
+        }
+    }
+}
+
 void wxTextCtrl::SetSelection( long from, long to )
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
+
+    if ( (m_windowStyle & wxTE_MULTILINE) &&
+         !GTK_TEXT(m_text)->line_start_cache )
+    {
+        // tell the programmer that it didn't work
+        wxLogDebug(_T("Can't call SetSelection() before realizing the control"));
+        return;
+    }
 
     gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 }
@@ -722,14 +827,14 @@ void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
 
 long wxTextCtrl::GetInsertionPoint() const
 {
-    wxCHECK_MSG( m_text != NULL, 0, _T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
 
     return (long) GTK_EDITABLE(m_text)->current_pos;
 }
 
 long wxTextCtrl::GetLastPosition() const
 {
-    wxCHECK_MSG( m_text != NULL, 0, _T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
 
     int pos = 0;
     if (m_windowStyle & wxTE_MULTILINE)
@@ -742,26 +847,17 @@ long wxTextCtrl::GetLastPosition() const
 
 void wxTextCtrl::Remove( long from, long to )
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-      
     gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
-    
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 }
 
 void wxTextCtrl::Replace( long from, long to, const wxString &value )
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-      
     gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
-    
+
     if (!value.IsEmpty())
     {
         gint pos = (gint)from;
@@ -772,31 +868,22 @@ void wxTextCtrl::Replace( long from, long to, const wxString &value )
         gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos );
 #endif
     }
-    
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 }
 
 void wxTextCtrl::Cut()
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-      
 #if (GTK_MINOR_VERSION > 0)
     gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );
 #else
     gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 );
 #endif
-    
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 }
 
 void wxTextCtrl::Copy()
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 #if (GTK_MINOR_VERSION > 0)
     gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) );
@@ -807,225 +894,196 @@ void wxTextCtrl::Copy()
 
 void wxTextCtrl::Paste()
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-      
 #if (GTK_MINOR_VERSION > 0)
     gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );
 #else
     gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 );
 #endif
-    
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-}
-
-bool wxTextCtrl::CanCopy() const
-{
-    // Can copy if there's a selection
-    long from, to;
-    GetSelection(& from, & to);
-    return (from != to) ;
-}
-
-bool wxTextCtrl::CanCut() const
-{
-    // Can cut if there's a selection
-    long from, to;
-    GetSelection(& from, & to);
-    return (from != to) ;
-}
-
-bool wxTextCtrl::CanPaste() const
-{
-    return IsEditable() ;
 }
 
 // Undo/redo
 void wxTextCtrl::Undo()
 {
     // TODO
-    wxFAIL_MSG( _T("wxTextCtrl::Undo not implemented") );
+    wxFAIL_MSG( wxT("wxTextCtrl::Undo not implemented") );
 }
 
 void wxTextCtrl::Redo()
 {
     // TODO
-    wxFAIL_MSG( _T("wxTextCtrl::Redo not implemented") );
+    wxFAIL_MSG( wxT("wxTextCtrl::Redo not implemented") );
 }
 
 bool wxTextCtrl::CanUndo() const
 {
     // TODO
-    wxFAIL_MSG( _T("wxTextCtrl::CanUndo not implemented") );
+    wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
     return FALSE;
 }
 
 bool wxTextCtrl::CanRedo() const
 {
     // TODO
-    wxFAIL_MSG( _T("wxTextCtrl::CanRedo not implemented") );
+    wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
     return FALSE;
 }
 
 // If the return values from and to are the same, there is no
 // selection.
-void wxTextCtrl::GetSelection(long* from, long* to) const
+void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
-    
-    if (!(GTK_EDITABLE(m_text)->has_selection))
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
+
+    long from, to;
+    if ( !(GTK_EDITABLE(m_text)->has_selection) )
     {
-        if (from) *from = 0;
-	if (to)   *to = 0;
-	return;
+        from =
+        to = GetInsertionPoint();
     }
-    
-    if (from) *from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
-    if (to)   *to = (long) GTK_EDITABLE(m_text)->selection_end_pos;
+    else // got selection
+    {
+        from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
+        to = (long) GTK_EDITABLE(m_text)->selection_end_pos;
+
+        if ( from > to )
+        {
+            // exchange them to be compatible with wxMSW
+            long tmp = from;
+            from = to;
+            to = tmp;
+        }
+    }
+
+    if ( fromOut )
+        *fromOut = from;
+    if ( toOut )
+        *toOut = to;
 }
 
 bool wxTextCtrl::IsEditable() const
 {
-    wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
 
     return GTK_EDITABLE(m_text)->editable;
 }
 
+bool wxTextCtrl::IsModified() const
+{
+    return m_modified;
+}
+
 void wxTextCtrl::Clear()
 {
-    SetValue( _T("") );
+    SetValue( wxT("") );
 }
 
 void wxTextCtrl::OnChar( wxKeyEvent &key_event )
 {
-    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
     if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
     {
         wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
         event.SetEventObject(this);
+        event.SetString(GetValue());
         if (GetEventHandler()->ProcessEvent(event)) return;
     }
 
+    if ((key_event.KeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE))
+    {
+        wxWindow *top_frame = m_parent;
+        while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
+            top_frame = top_frame->GetParent();
+        GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
+
+        if (window->default_widget)
+        {
+            gtk_widget_activate (window->default_widget);
+            return;
+        }
+    }
+
     key_event.Skip();
 }
 
-#if wxUSE_STD_IOSTREAM
-int wxTextCtrl::overflow( int WXUNUSED(c) )
+GtkWidget* wxTextCtrl::GetConnectWidget()
 {
-    int len = pptr() - pbase();
-    char *txt = new char[len+1];
-    strncpy(txt, pbase(), len);
-    txt[len] = '\0';
-    (*this) << txt;
-    setp(pbase(), epptr());
-    delete[] txt;
-    return EOF;
+    return GTK_WIDGET(m_text);
 }
 
-int wxTextCtrl::sync()
+bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
 {
-    int len = pptr() - pbase();
-    char *txt = new char[len+1];
-    strncpy(txt, pbase(), len);
-    txt[len] = '\0';
-    (*this) << txt;
-    setp(pbase(), epptr());
-    delete[] txt;
-    return 0;
+    if (m_windowStyle & wxTE_MULTILINE)
+        return (window == GTK_TEXT(m_text)->text_area);
+    else
+        return (window == GTK_ENTRY(m_text)->text_area);
 }
 
-int wxTextCtrl::underflow()
+// the font will change for subsequent text insertiongs
+bool wxTextCtrl::SetFont( const wxFont &font )
 {
-    return EOF;
-}
-#endif
+    wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
 
-wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
-{
-    AppendText(s);
-    return *this;
-}
+    if ( !wxWindowBase::SetFont(font) )
+    {
+        // font didn't change, nothing to do
+        return FALSE;
+    }
 
-wxTextCtrl& wxTextCtrl::operator<<(float f)
-{
-    static char buf[100];
-    sprintf(buf, "%.2f", f);
-    AppendText(buf);
-    return *this;
-}
+    if ( m_windowStyle & wxTE_MULTILINE )
+    {
+        m_updateFont = TRUE;
 
-wxTextCtrl& wxTextCtrl::operator<<(double d)
-{
-    static char buf[100];
-    sprintf(buf, "%.2f", d);
-    AppendText(buf);
-    return *this;
-}
+        m_defaultStyle.SetFont(font);
 
-wxTextCtrl& wxTextCtrl::operator<<(int i)
-{
-    static char buf[100];
-    sprintf(buf, "%i", i);
-    AppendText(buf);
-    return *this;
-}
+        ChangeFontGlobally();
+    }
 
-wxTextCtrl& wxTextCtrl::operator<<(long i)
-{
-    static char buf[100];
-    sprintf(buf, "%ld", i);
-    AppendText(buf);
-    return *this;
+    return TRUE;
 }
 
-wxTextCtrl& wxTextCtrl::operator<<(const char c)
+void wxTextCtrl::ChangeFontGlobally()
 {
-    char buf[2];
+    // this method is very inefficient and hence should be called as rarely as
+    // possible!
+    wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont,
+                  _T("shouldn't be called for single line controls") );
 
-    buf[0] = c;
-    buf[1] = 0;
-    AppendText(buf);
-    return *this;
-}
+    wxString value = GetValue();
+    if ( !value.IsEmpty() )
+    {
+        m_updateFont = FALSE;
 
-GtkWidget* wxTextCtrl::GetConnectWidget()
-{
-    return GTK_WIDGET(m_text);
+        Clear();
+        AppendText(value);
+    }
 }
 
-bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
+void wxTextCtrl::UpdateFontIfNeeded()
 {
-    if (m_windowStyle & wxTE_MULTILINE)
-        return (window == GTK_TEXT(m_text)->text_area);
-    else
-        return (window == GTK_ENTRY(m_text)->text_area);
+    if ( m_updateFont )
+        ChangeFontGlobally();
 }
 
-bool wxTextCtrl::SetFont( const wxFont &WXUNUSED(font) )
+bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
 {
-    wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") );
-
-    // doesn't work
-    return FALSE;
-}
+    if ( !wxControl::SetForegroundColour(colour) )
+        return FALSE;
 
-bool wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) )
-{
-    wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") );
+    // update default fg colour too
+    m_defaultStyle.SetTextColour(colour);
 
-    // doesn't work
-    return FALSE;
+    return TRUE;
 }
 
 bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 {
-    wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
 
-    wxControl::SetBackgroundColour( colour );
+    if ( !wxControl::SetBackgroundColour( colour ) )
+        return FALSE;
 
     if (!m_widget->window)
         return FALSE;
@@ -1051,9 +1109,72 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
         gdk_window_clear( window );
     }
 
+    // change active background color too
+    m_defaultStyle.SetBackgroundColour( colour );
+
     return TRUE;
 }
 
+bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr &style )
+{
+    /* VERY dirty way to do that - removes the required text and re-adds it
+       with styling (FIXME) */
+    if ( m_windowStyle & wxTE_MULTILINE )
+    {
+        if ( style.IsDefault() )
+        {
+            // nothing to do
+            return TRUE;
+        }
+
+        gint l = gtk_text_get_length( GTK_TEXT(m_text) );
+
+        wxCHECK_MSG( start >= 0 && end <= l, FALSE,
+                     _T("invalid range in wxTextCtrl::SetStyle") );
+
+        gint old_pos = gtk_editable_get_position( GTK_EDITABLE(m_text) );
+        char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), start, end );
+        wxString tmp(text,*wxConvCurrent);
+        g_free( text );
+
+        gtk_editable_delete_text( GTK_EDITABLE(m_text), start, end );
+        gtk_editable_set_position( GTK_EDITABLE(m_text), start );
+
+#if wxUSE_UNICODE
+        wxWX2MBbuf buf = tmp.mbc_str();
+        const char *txt = buf;
+        size_t txtlen = strlen(buf);
+#else
+        const char *txt = tmp;
+        size_t txtlen = tmp.length();
+#endif
+
+        GdkFont *font = style.HasFont()
+                            ? style.GetFont().GetInternalFont()
+                            : NULL;
+
+        GdkColor *colFg = style.HasTextColour()
+                            ? style.GetTextColour().GetColor()
+                            : NULL;
+
+        GdkColor *colBg = style.HasBackgroundColour()
+                            ? style.GetBackgroundColour().GetColor()
+                            : NULL;
+
+        gtk_text_insert( GTK_TEXT(m_text), font, colFg, colBg, txt, txtlen );
+
+        /* does not seem to help under GTK+ 1.2 !!!
+        gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */
+        SetInsertionPoint( old_pos );
+        return TRUE;
+    }
+    else // singe line
+    {
+        // cannot do this for GTK+'s Entry widget
+        return FALSE;
+    }
+}
+
 void wxTextCtrl::ApplyWidgetStyle()
 {
     if (m_windowStyle & wxTE_MULTILINE)
@@ -1116,3 +1237,115 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
 {
     event.Enable( CanRedo() );
 }
+
+void wxTextCtrl::OnInternalIdle()
+{
+    wxCursor cursor = m_cursor;
+    if (g_globalCursor.Ok()) cursor = g_globalCursor;
+
+    if (cursor.Ok())
+    {
+        GdkWindow *window = (GdkWindow*) NULL;
+        if (HasFlag(wxTE_MULTILINE))
+            window = GTK_TEXT(m_text)->text_area;
+        else
+            window = GTK_ENTRY(m_text)->text_area;
+
+        if (window)
+            gdk_window_set_cursor( window, cursor.GetCursor() );
+
+        if (!g_globalCursor.Ok())
+            cursor = *wxSTANDARD_CURSOR;
+
+        window = m_widget->window;
+        if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget)))
+            gdk_window_set_cursor( window, cursor.GetCursor() );
+    }
+
+    UpdateWindowUI();
+}
+
+wxSize wxTextCtrl::DoGetBestSize() const
+{
+    // FIXME should be different for multi-line controls...
+    wxSize ret( wxControl::DoGetBestSize() );
+    return wxSize(80, ret.y);
+}
+
+// ----------------------------------------------------------------------------
+// freeze/thaw
+// ----------------------------------------------------------------------------
+
+void wxTextCtrl::Freeze()
+{
+    if ( HasFlag(wxTE_MULTILINE) )
+    {
+        gtk_text_freeze(GTK_TEXT(m_text));
+    }
+}
+
+void wxTextCtrl::Thaw()
+{
+    if ( HasFlag(wxTE_MULTILINE) )
+    {
+        GTK_TEXT(m_text)->vadj->value = 0.0;
+
+        gtk_text_thaw(GTK_TEXT(m_text));
+    }
+}
+
+// ----------------------------------------------------------------------------
+// scrolling
+// ----------------------------------------------------------------------------
+
+GtkAdjustment *wxTextCtrl::GetVAdj() const
+{
+    return HasFlag(wxTE_MULTILINE) ? GTK_TEXT(m_text)->vadj : NULL;
+}
+
+bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff)
+{
+    float value = adj->value + diff;
+
+    if ( value < 0 )
+        value = 0;
+
+    float upper = adj->upper - adj->page_size;
+    if ( value > upper )
+        value = upper;
+
+    // did we noticeably change the scroll position?
+    if ( fabs(adj->value - value) < 0.2 )
+    {
+        // well, this is what Robert does in wxScrollBar, so it must be good...
+        return FALSE;
+    }
+
+    adj->value = value;
+
+    gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed");
+
+    return TRUE;
+}
+
+bool wxTextCtrl::ScrollLines(int lines)
+{
+    GtkAdjustment *adj = GetVAdj();
+    if ( !adj )
+        return FALSE;
+
+    // this is hardcoded to 10 in GTK+ 1.2 (great idea)
+    static const int KEY_SCROLL_PIXELS = 10;
+
+    return DoScroll(adj, lines*KEY_SCROLL_PIXELS);
+}
+
+bool wxTextCtrl::ScrollPages(int pages)
+{
+    GtkAdjustment *adj = GetVAdj();
+    if ( !adj )
+        return FALSE;
+
+    return DoScroll(adj, (int)ceil(pages*adj->page_increment));
+}
+