Support wxFULLSCREEN_NOSTATUSBAR

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

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 468f7262a25feef63c6a98a5ae4c32aefacf86f5..147486f8647ba9642c30e14c98bc998c1b107307 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,25 +7,29 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "textctrl.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/textctrl.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/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 <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.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"
-#include "gdk/gdkkeysyms.h"
+#include "wx/gtk1/private.h"
+#include <gdk/gdkkeysyms.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -38,13 +42,38 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern bool       g_blockEventsOnDrag;

 extern wxCursor   g_globalCursor;
 extern wxCursor   g_globalCursor;

+extern wxWindowGTK *g_delayedFocus;
+
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------
+
+extern "C" {
+static void wxGtkTextInsert(GtkWidget *text,
+                            const wxTextAttr& attr,
+                            const char *txt,
+                            size_t len)
+{
+    GdkFont *font = attr.HasFont() ? attr.GetFont().GetInternalFont()
+                                   : NULL;
+
+    GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor()
+                                           : NULL;
+
+    GdkColor *colBg = attr.HasBackgroundColour()
+                        ? attr.GetBackgroundColour().GetColor()
+                        : NULL;
+
+    gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len );
+}
+}

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

+extern "C" {

 static void
 gtk_insert_text_callback(GtkEditable *editable,
                          const gchar *new_text,
 static void
 gtk_insert_text_callback(GtkEditable *editable,
                          const gchar *new_text,


@@ -52,6 +81,9 @@ gtk_insert_text_callback(GtkEditable *editable,
                          gint *position,
                          wxTextCtrl *win)
 {
                          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);
 
     // we should only be called if we have a max len limit at all
     GtkEntry *entry = GTK_ENTRY (editable);
 


@@ -77,13 +109,15 @@ gtk_insert_text_callback(GtkEditable *editable,
         win->GetEventHandler()->ProcessEvent( event );
     }
 }
         win->GetEventHandler()->ProcessEvent( event );
     }
 }

+}

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

+extern "C" {

 static void
 static void

-gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
+gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )

 {
     if ( win->IgnoreTextUpdate() )
         return;
 {
     if ( win->IgnoreTextUpdate() )
         return;


@@ -98,14 +132,15 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 
     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->GetEventHandler()->ProcessEvent( event );
 }

+}

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

+extern "C" {

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


@@ -116,119 +151,45 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 
     win->CalculateScrollbar();
 }
 
     win->CalculateScrollbar();
 }

+}

 
 

-//-----------------------------------------------------------------------------
-// "focus_in_event"
-//-----------------------------------------------------------------------------
-
-extern wxWindow  *g_focusWindow;
-extern bool       g_blockEventsOnDrag;
-// extern bool g_isIdle;
-
-static gint gtk_text_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win )
-{
-    // Necessary?
-#if 0
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-#endif
-    if (!win->m_hasVMT) return FALSE;
-    if (g_blockEventsOnDrag) return FALSE;
-
-    g_focusWindow = win;
-
-    // notify the parent that we got the focus
-    wxChildFocusEvent eventFocus(win);
-    (void)win->GetEventHandler()->ProcessEvent(eventFocus);
-
-#ifdef HAVE_XIM
-    if (win->m_ic)
-        gdk_im_begin(win->m_ic, win->m_wxwindow->window);
-#endif
+// ----------------------------------------------------------------------------
+// redraw callback for multiline text
+// ----------------------------------------------------------------------------

 
 

-#if 0
-#ifdef wxUSE_CARET
-    // caret needs to be informed about focus change
-    wxCaret *caret = win->GetCaret();
-    if ( caret )
-    {
-        caret->OnSetFocus();
-    }
-#endif // wxUSE_CARET
-#endif
+// 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()

 
 

-    wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() );
-    event.SetEventObject( win );
+extern bool wxIsInsideYield;

 
 

-    if (win->GetEventHandler()->ProcessEvent( event ))
-    {
-        return TRUE;
-    }
-
-    return FALSE;
+extern "C" {
+    typedef void (*GtkDrawCallback)(GtkWidget *widget, GdkRectangle *rect);

 }
 
 }
 

-//-----------------------------------------------------------------------------
-// "focus_out_event"
-//-----------------------------------------------------------------------------
+static GtkDrawCallback gs_gtk_text_draw = NULL;

 
 

-static gint gtk_text_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win )
+extern "C" {
+static void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)

 {
 {

-#if 0
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-#endif
-
-    if (!win->m_hasVMT) return FALSE;
-    if (g_blockEventsOnDrag) return FALSE;
-
-#if 0
-    // if the focus goes out of our app alltogether, OnIdle() will send
-    // wxActivateEvent, otherwise gtk_window_focus_in_callback() will reset
-    // g_sendActivateEvent to -1
-    g_sendActivateEvent = 0;
-#endif
-
-    wxWindow *winFocus = wxFindFocusedChild(win);
-    if ( winFocus )
-        win = winFocus;
-
-    g_focusWindow = (wxWindow *)NULL;
-
-#ifdef HAVE_XIM
-    if (win->m_ic)
-        gdk_im_end();
-#endif
-
-#if 0
-#ifdef wxUSE_CARET
-    // caret needs to be informed about focus change
-    wxCaret *caret = win->GetCaret();
-    if ( caret )
+    if ( !wxIsInsideYield )

     {
     {

-        caret->OnKillFocus();
-    }
-#endif // wxUSE_CARET
-#endif
+        wxCHECK_RET( gs_gtk_text_draw != wxgtk_text_draw,
+                     _T("infinite recursion in wxgtk_text_draw aborted") );

 
 

-    wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
-    event.SetEventObject( win );
-
-    if (win->GetEventHandler()->ProcessEvent( event ))
-    {
-        return TRUE;
+        gs_gtk_text_draw(widget, rect);

     }
     }

-
-    return FALSE;
+}

 }
 
 //-----------------------------------------------------------------------------
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 

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

 
 

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


@@ -247,12 +208,16 @@ END_EVENT_TABLE()
 void wxTextCtrl::Init()
 {
     m_ignoreNextUpdate =
 void wxTextCtrl::Init()
 {
     m_ignoreNextUpdate =

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

     m_text =
     m_vScrollbar = (GtkWidget *)NULL;
 }
 
     m_text =
     m_vScrollbar = (GtkWidget *)NULL;
 }
 

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

 wxTextCtrl::wxTextCtrl( wxWindow *parent,
                         wxWindowID id,
                         const wxString &value,
 wxTextCtrl::wxTextCtrl( wxWindow *parent,
                         wxWindowID id,
                         const wxString &value,


@@ -276,34 +241,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;
 
     bool multi_line = (style & wxTE_MULTILINE) != 0;

+

     if (multi_line)
     {
     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 ... */
+        // create our control ...

         m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
 
         m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) 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;

         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,


@@ -311,27 +270,10 @@ bool wxTextCtrl::Create( wxWindow *parent,
                       (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
                        0, 0);
 
                       (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
                        0, 0);
 

-        /* always wrap words */
+        // always wrap words

         gtk_text_set_word_wrap( GTK_TEXT(m_text), TRUE );
 
         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)
-        {
-            GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj);
-            GTK_WIDGET_UNSET_FLAGS( hscrollbar, GTK_CAN_FOCUS );
-            gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2,
-                       (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
-                       GTK_FILL,
-                       0, 0);
-            gtk_widget_show(hscrollbar);
-
-            /* don't wrap lines, otherwise we wouldn't need the scrollbar */
-            gtk_text_set_line_wrap( GTK_TEXT(m_text), FALSE );
-        }
-#endif
-
-        /* finally, put the vertical scrollbar in the upper right corner */
+        // 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 );
         gtk_table_attach(GTK_TABLE(m_widget), m_vScrollbar, 1, 2, 0, 1,
         m_vScrollbar = gtk_vscrollbar_new( GTK_TEXT(m_text)->vadj );
         GTK_WIDGET_UNSET_FLAGS( m_vScrollbar, GTK_CAN_FOCUS );
         gtk_table_attach(GTK_TABLE(m_widget), m_vScrollbar, 1, 2, 0, 1,


@@ -341,25 +283,16 @@ bool wxTextCtrl::Create( wxWindow *parent,
     }
     else
     {
     }
     else
     {

-        /* a single-line text control: no need for scrollbars */
+        // a single-line text control: no need for scrollbars

         m_widget =
         m_widget =

-          m_text = gtk_entry_new();
+        m_text = gtk_entry_new();

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

-    PostCreation();
-
-    SetFont( parent->GetFont() );
+    m_focusWidget = m_text;

 
 

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

 
     if (multi_line)
         gtk_widget_show(m_text);
 
     if (multi_line)
         gtk_widget_show(m_text);


@@ -369,43 +302,39 @@ bool wxTextCtrl::Create( wxWindow *parent,
         gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed",
           (GtkSignalFunc) gtk_scrollbar_changed_callback, (gpointer) this );
 
         gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed",
           (GtkSignalFunc) gtk_scrollbar_changed_callback, (gpointer) this );
 

-        gtk_signal_connect( GTK_OBJECT(GTK_TEXT(m_text)), "focus_in_event",
-              GTK_SIGNAL_FUNC(gtk_text_focus_in_callback), (gpointer)this );
+        // only initialize gs_gtk_text_draw once, starting from the next the
+        // klass::draw will already be wxgtk_text_draw
+        if ( !gs_gtk_text_draw )
+        {
+            GtkDrawCallback&
+                draw = GTK_WIDGET_CLASS(GTK_OBJECT(m_text)->klass)->draw;

 
 

-        gtk_signal_connect( GTK_OBJECT(GTK_TEXT(m_text)), "focus_out_event",
-                           GTK_SIGNAL_FUNC(gtk_text_focus_out_callback), (gpointer)this );
-    }
-    else
-    {
-        gtk_signal_connect( GTK_OBJECT(m_text), "focus_in_event",
-              GTK_SIGNAL_FUNC(gtk_text_focus_in_callback), (gpointer)this );
+            gs_gtk_text_draw = draw;

 
 

-        gtk_signal_connect( GTK_OBJECT(m_text), "focus_out_event",
-                           GTK_SIGNAL_FUNC(gtk_text_focus_out_callback), (gpointer)this );
+            draw = wxgtk_text_draw;
+        }

     }
 
     }
 

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

     {
     {

-        gint tmp = 0;
-
-#if GTK_MINOR_VERSION == 0
+#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()
         gtk_widget_realize(m_text);
 #endif // GTK 1.0
 
         // if we don't realize it, GTK 1.0.6 dies with a SIGSEGV in
         // gtk_editable_insert_text()
         gtk_widget_realize(m_text);
 #endif // GTK 1.0
 

+        gint tmp = 0;

 #if wxUSE_UNICODE
         wxWX2MBbuf val = value.mbc_str();
         gtk_editable_insert_text( GTK_EDITABLE(m_text), val, strlen(val), &tmp );
 #if wxUSE_UNICODE
         wxWX2MBbuf val = value.mbc_str();
         gtk_editable_insert_text( GTK_EDITABLE(m_text), val, strlen(val), &tmp );

-#else // !Unicode
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
-#endif // Unicode/!Unicode
+#else
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.length(), &tmp );
+#endif

 
         if (multi_line)
         {
 
         if (multi_line)
         {

-            /* bring editable's cursor uptodate. bug in GTK. */
-
-            GTK_EDITABLE(m_text)->current_pos = 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) ));

         }
     }
 
         }
     }
 


@@ -426,30 +355,19 @@ bool wxTextCtrl::Create( wxWindow *parent,
             gtk_text_set_editable( GTK_TEXT(m_text), 1 );
     }
 
             gtk_text_set_editable( GTK_TEXT(m_text), 1 );
     }
 

-    /* we want to be notified about text changes */
+    // We want to be notified about text changes.

     gtk_signal_connect( GTK_OBJECT(m_text), "changed",
     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 );
+        GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);

 
     m_cursor = wxCursor( wxCURSOR_IBEAM );
 
 
     m_cursor = wxCursor( wxCURSOR_IBEAM );
 

-    // FIXME: is the bg colour correct here?
-    wxTextAttr attrDef( colFg,
-                        wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW),
-                        parent->GetFont() );
+    wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont());

     SetDefaultStyle( attrDef );
 
     SetDefaultStyle( attrDef );
 

-    Show( TRUE );
-
-    return TRUE;
+    return true;

 }
 
 }
 

+

 void wxTextCtrl::CalculateScrollbar()
 {
     if ((m_windowStyle & wxTE_MULTILINE) == 0) return;
 void wxTextCtrl::CalculateScrollbar()
 {
     if ((m_windowStyle & wxTE_MULTILINE) == 0) return;


@@ -461,7 +379,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


@@ -469,57 +387,59 @@ 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;

         }
     }
 }
 
 wxString wxTextCtrl::GetValue() const
 {
         }
     }
 }
 
 wxString wxTextCtrl::GetValue() 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)
     {
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
 
     wxString tmp;
     if (m_windowStyle & wxTE_MULTILINE)
     {
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );

-        tmp = wxString(text,*wxConvCurrent);
+        tmp = text;

         g_free( text );
     }
     else
     {
         g_free( text );
     }
     else
     {

-        tmp = wxString(gtk_entry_get_text( GTK_ENTRY(m_text) ),*wxConvCurrent);
+        tmp = wxGTK_CONV_BACK( gtk_entry_get_text( GTK_ENTRY(m_text) ) );

     }
     }

+

     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 ( !(flags & SetValue_SendEvent) )
+    {
+        // do not generate events
+        IgnoreNextTextUpdate();
+    }
+

     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 (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 = value.mbc_str();
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), tmpbuf, strlen(tmpbuf), &len );
-#else
-        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
     {

-        gtk_entry_set_text( GTK_ENTRY(m_text), value.mbc_str() );
+        gtk_entry_set_text( GTK_ENTRY(m_text), wxGTK_CONV( value ) );

     }
 
     // GRG, Jun/2000: Changed this after a lot of discussion in
     }
 
     // GRG, Jun/2000: Changed this after a lot of discussion in

-    //   the lists. wxWindows 2.2 will have a set of flags to
+    //   the lists. wxWidgets 2.2 will have a set of flags to

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


@@ -529,142 +449,88 @@ void wxTextCtrl::WriteText( const wxString &text )
     if ( text.empty() )
         return;
 
     if ( text.empty() )
         return;
 

-#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
+    // gtk_text_changed_callback() will set m_modified to true but m_modified
+    // shouldn't be changed by the program writing to the text control itself,
+    // so save the old value and restore when we're done
+    bool oldModified = m_modified;

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

-        /* this moves the cursor pos to behind the inserted text */
-        gint len = GTK_EDITABLE(m_text)->current_pos;
-
-        // if we have any special style, use it
-        if ( !m_defaultStyle.IsDefault() )
+        // After cursor movements, gtk_text_get_point() is wrong by one.
+        gtk_text_set_point( GTK_TEXT(m_text), GET_EDITABLE_POS(m_text) );
+
+        // always use m_defaultStyle, even if it is empty as otherwise
+        // 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.length());
+
+        // we called wxGtkTextInsert with correct font, no need to do anything
+        // in UpdateFontIfNeeded() any longer
+        if ( !text.empty() )

         {
         {

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

         }
 
         }
 

-        /* bring editable's cursor uptodate. bug in GTK. */
-        GTK_EDITABLE(m_text)->current_pos = 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) ));

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

-        /* this moves the cursor pos to behind the inserted text */
-        gint len = GTK_EDITABLE(m_text)->current_pos;
-        gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len );
+        // First remove the selection if there is one
+        gtk_editable_delete_selection( GTK_EDITABLE(m_text) );
+
+        // This moves the cursor pos to behind the inserted text.
+        gint len = GET_EDITABLE_POS(m_text);

 
 

-        /* bring editable's cursor uptodate. bug in GTK. */
-        GTK_EDITABLE(m_text)->current_pos += text.Len();
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), text.c_str(), text.length(), &len );

 
 

-        /* bring entry's cursor uptodate. bug in GTK. */
-        gtk_entry_set_position( GTK_ENTRY(m_text), GTK_EDITABLE(m_text)->current_pos );
+        // Bring entry's cursor uptodate.
+        gtk_entry_set_position( GTK_ENTRY(m_text), len );

     }
     }

+
+    m_modified = oldModified;

 }
 
 void wxTextCtrl::AppendText( const wxString &text )
 {
 }
 
 void wxTextCtrl::AppendText( const wxString &text )
 {

-    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-
-    if ( text.empty() )
-        return;
-
-#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
+    SetInsertionPointEnd();
+    WriteText( text );
+}

 
 

+wxString wxTextCtrl::GetLineText( long lineNo ) const
+{

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

-        if ( !m_defaultStyle.IsDefault() )
-        {
-            wxFont font = m_defaultStyle.HasFont() ? m_defaultStyle.GetFont()
-                                                   : m_font;
-            GdkFont *fnt = font.Ok() ? font.GetInternalFont() : NULL;
-
-            wxColour col = m_defaultStyle.HasTextColour()
-                                ? m_defaultStyle.GetTextColour()
-                                : m_foregroundColour;
-            GdkColor *colFg = col.Ok() ? col.GetColor() : NULL;
+        gint len = gtk_text_get_length( GTK_TEXT(m_text) );
+        char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );

 
 

-            col = m_defaultStyle.HasBackgroundColour()
-                    ? m_defaultStyle.GetBackgroundColour()
-                    : m_backgroundColour;
-            GdkColor *colBg = col.Ok() ? col.GetColor() : NULL;
+        if (text)
+        {
+            wxString buf;
+            long i;
+            int currentLine = 0;
+            for (i = 0; currentLine != lineNo && text[i]; i++ )
+                if (text[i] == '\n')
+            currentLine++;
+            // Now get the text
+            int j;
+            for (j = 0; text[i] && text[i] != '\n'; i++, j++ )
+                buf += text[i];

 
 

-            gtk_text_insert( GTK_TEXT(m_text), fnt, colFg, colBg, txt, txtlen );
+            g_free( text );
+            return buf;

         }
         }

-        else // no style
+        else

         {
         {

-            /* 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 );
+            return wxEmptyString;

         }
         }

-
-        /* bring editable's cursor uptodate. bug in GTK. */
-        GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
-    }
-    else // single line
-    {
-        gtk_entry_append_text( GTK_ENTRY(m_text), txt );

     }
     }

-}
-
-wxString wxTextCtrl::GetLineText( long lineNo ) const
-{
-  if (m_windowStyle & wxTE_MULTILINE)
-  {
-    gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-    char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
-
-    if (text)
+    else

     {
     {

-        wxString buf(wxT(""));
-        long i;
-        int currentLine = 0;
-        for (i = 0; currentLine != lineNo && text[i]; i++ )
-          if (text[i] == '\n')
-            currentLine++;
-        // Now get the text
-        int j;
-        for (j = 0; text[i] && text[i] != '\n'; i++, j++ )
-            buf += text[i];
-
-        g_free( text );
-        return buf;
+        if (lineNo == 0) return GetValue();
+        return wxEmptyString;

     }
     }

-    else
-      return wxEmptyString;
-  }
-  else
-  {
-    if (lineNo == 0) return GetValue();
-    return wxEmptyString;
-  }

 }
 
 void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
 }
 
 void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )


@@ -681,8 +547,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


@@ -709,11 +575,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


@@ -730,7 +596,7 @@ 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
 }
 
 int wxTextCtrl::GetNumberOfLines() const


@@ -768,16 +634,13 @@ void wxTextCtrl::SetInsertionPoint( long pos )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

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

     {
     {

-        /* seems to be broken in GTK 1.0.X:
-           gtk_text_set_point( GTK_TEXT(m_text), (int)pos ); */
-

         gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
           GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 
         /* we fake a set_point by inserting and deleting. as the user
         gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
           GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 
         /* we fake a set_point by inserting and deleting. as the user

-           isn't supposed to get to know about thos non-sense, we
+           isn't supposed to get to know about this non-sense, we

            disconnect so that no events are sent to the user program. */
 
         gint tmp = (gint)pos;
            disconnect so that no events are sent to the user program. */
 
         gint tmp = (gint)pos;


@@ -787,17 +650,15 @@ void wxTextCtrl::SetInsertionPoint( long pos )
         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);
 

-        /* bring editable's cursor uptodate. another bug in GTK. */
-
-        GTK_EDITABLE(m_text)->current_pos = 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) ));

     }
     else
     {
         gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
 
     }
     else
     {
         gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
 

-        /* bring editable's cursor uptodate. bug in GTK. */
-
-        GTK_EDITABLE(m_text)->current_pos = (guint32)pos;
+        // Bring editable's cursor uptodate. Bug in GTK.
+        SET_EDITABLE_POS(m_text, (guint32)pos);

     }
 }
 
     }
 }
 


@@ -806,9 +667,13 @@ void wxTextCtrl::SetInsertionPointEnd()
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
     if (m_windowStyle & wxTE_MULTILINE)
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
     if (m_windowStyle & wxTE_MULTILINE)

+    {

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

+    }

     else
     else

+    {

         gtk_entry_set_position( GTK_ENTRY(m_text), -1 );
         gtk_entry_set_position( GTK_ENTRY(m_text), -1 );

+    }

 }
 
 void wxTextCtrl::SetEditable( bool editable )
 }
 
 void wxTextCtrl::SetEditable( bool editable )


@@ -816,9 +681,13 @@ void wxTextCtrl::SetEditable( bool editable )
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
     if (m_windowStyle & wxTE_MULTILINE)
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
     if (m_windowStyle & wxTE_MULTILINE)

+    {

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

+    }

     else
     else

+    {

         gtk_entry_set_editable( GTK_ENTRY(m_text), editable );
         gtk_entry_set_editable( GTK_ENTRY(m_text), editable );

+    }

 }
 
 bool wxTextCtrl::Enable( bool enable )
 }
 
 bool wxTextCtrl::Enable( bool enable )


@@ -826,7 +695,7 @@ bool wxTextCtrl::Enable( bool enable )
     if (!wxWindowBase::Enable(enable))
     {
         // nothing to do
     if (!wxWindowBase::Enable(enable))
     {
         // nothing to do

-        return FALSE;
+        return false;

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


@@ -839,7 +708,7 @@ bool wxTextCtrl::Enable( bool enable )
         gtk_widget_set_sensitive( m_text, enable );
     }
 
         gtk_widget_set_sensitive( m_text, enable );
     }
 

-    return TRUE;
+    return true;

 }
 
 // wxGTK-specific: called recursively by Enable,
 }
 
 // wxGTK-specific: called recursively by Enable,


@@ -862,9 +731,14 @@ void wxTextCtrl::OnParentEnable( bool enable )
     }
 }
 
     }
 }
 

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

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

-    m_modified = FALSE;
+    m_modified = false;

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


@@ -873,19 +747,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)


@@ -926,6 +800,12 @@ void wxTextCtrl::SetSelection( long from, long to )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

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

     if ( (m_windowStyle & wxTE_MULTILINE) &&
          !GTK_TEXT(m_text)->line_start_cache )
     {
     if ( (m_windowStyle & wxTE_MULTILINE) &&
          !GTK_TEXT(m_text)->line_start_cache )
     {


@@ -934,30 +814,51 @@ void wxTextCtrl::SetSelection( long from, long to )
         return;
     }
 
         return;
     }
 

-    gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+        gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+    }
+    else
+    {
+        gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+    }

 }
 
 }
 

-void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
+void wxTextCtrl::ShowPosition( long pos )

 {
 {

-//    SetInsertionPoint( pos );
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+        GtkAdjustment *vp = GTK_TEXT(m_text)->vadj;
+        float totalLines =  (float) GetNumberOfLines();
+        long posX;
+        long posY;
+        PositionToXY(pos, &posX, &posY);
+        float posLine = (float) posY;
+        float p = (posLine/totalLines)*(vp->upper - vp->lower) + vp->lower;
+        gtk_adjustment_set_value(GTK_TEXT(m_text)->vadj, p);
+    }

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

-
-    return (long) GTK_EDITABLE(m_text)->current_pos;
+    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") );
 
     int pos = 0;
 {
     wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
 
     int pos = 0;

+

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

+    {

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

+    }

     else
     else

+    {

         pos = GTK_ENTRY(m_text)->text_length;
         pos = GTK_ENTRY(m_text)->text_length;

+    }

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


@@ -965,7 +866,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") );

-

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


@@ -973,51 +873,36 @@ void wxTextCtrl::Replace( long from, long to, const wxString &value )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-    gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+    Remove( from, to );

 
 

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

     {
         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 );
-#endif
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.length(), &pos );
+#endif // wxUSE_UNICODE

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

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

-
-#if (GTK_MINOR_VERSION > 0)
-    gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) );
-#else
-    gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 );
-#endif
+    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") );

-
-#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_editable_paste_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);

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


@@ -1036,15 +921,15 @@ void wxTextCtrl::Redo()
 bool wxTextCtrl::CanUndo() const
 {
     // TODO
 bool wxTextCtrl::CanUndo() const
 {
     // TODO

-    wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
-    return FALSE;
+    //wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
+    return false;

 }
 
 bool wxTextCtrl::CanRedo() const
 {
     // TODO
 }
 
 bool wxTextCtrl::CanRedo() const
 {
     // TODO

-    wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
-    return FALSE;
+    //wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
+    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


@@ -1053,25 +938,27 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-    long from, to;
-    if ( !(GTK_EDITABLE(m_text)->has_selection) )
-    {
-        from =
-        to = GetInsertionPoint();
-    }
-    else // got selection
-    {
-        from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
-        to = (long) GTK_EDITABLE(m_text)->selection_end_pos;
+    gint from = -1;
+    gint to = -1;
+    bool haveSelection = false;

 
 

-        if ( from > to )
-        {
-            // exchange them to be compatible with wxMSW
-            long tmp = from;
-            from = to;
-            to = tmp;
-        }
-    }
+     if ( (GTK_EDITABLE(m_text)->has_selection) )
+     {
+         haveSelection = true;
+         from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
+         to = (long) GTK_EDITABLE(m_text)->selection_end_pos;
+     }
+
+     if (! haveSelection )
+          from = to = GetInsertionPoint();
+
+     if ( from > to )
+     {
+         // exchange them to be compatible with wxMSW
+         gint tmp = from;
+         from = to;
+         to = tmp;
+     }

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


@@ -1079,10 +966,10 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
         *toOut = to;
 }
 
         *toOut = to;
 }
 

+

 bool wxTextCtrl::IsEditable() const
 {
 bool wxTextCtrl::IsEditable() const
 {

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

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


@@ -1093,14 +980,14 @@ 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.KeyCode() == 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);
     {
         wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
         event.SetEventObject(this);


@@ -1108,17 +995,24 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event )
         if (GetEventHandler()->ProcessEvent(event)) return;
     }
 
         if (GetEventHandler()->ProcessEvent(event)) return;
     }
 

-    if ((key_event.KeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE))
+    if ((key_event.GetKeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE))

     {
     {

+        // This will invoke the dialog default action, such
+        // as the clicking the default button.
+

         wxWindow *top_frame = m_parent;
         while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
             top_frame = top_frame->GetParent();
         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)
+        if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))

         {
         {

-            gtk_widget_activate (window->default_widget);
-            return;
+            GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
+
+            if (window->default_widget)
+            {
+                gtk_widget_activate (window->default_widget);
+                return;
+            }

         }
     }
 
         }
     }
 


@@ -1133,32 +1027,36 @@ GtkWidget* wxTextCtrl::GetConnectWidget()
 bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
 {
     if (m_windowStyle & wxTE_MULTILINE)
 bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
 {
     if (m_windowStyle & wxTE_MULTILINE)

+    {

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

+    }

     else
     else

+    {

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

+    }

 }
 
 // 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 ( !wxWindowBase::SetFont(font) )
+    if ( !wxTextCtrlBase::SetFont(font) )

     {
         // font didn't change, nothing to do
     {
         // font didn't change, nothing to do

-        return FALSE;
+        return false;

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

-        m_updateFont = TRUE;
+        SetUpdateFont(true);

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

-    return TRUE;
+    return true;

 }
 
 void wxTextCtrl::ChangeFontGlobally()
 }
 
 void wxTextCtrl::ChangeFontGlobally()


@@ -1166,12 +1064,13 @@ void wxTextCtrl::ChangeFontGlobally()
     // this method is very inefficient and hence should be called as rarely as
     // possible!
     wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont,
     // 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") );
 
     wxString value = GetValue();
                   _T("shouldn't be called for single line controls") );
 
     wxString value = GetValue();

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

     {
     {

-        m_updateFont = FALSE;
+        SetUpdateFont(false);

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


@@ -1187,40 +1086,32 @@ void wxTextCtrl::UpdateFontIfNeeded()
 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;

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

-        return FALSE;
-
-    wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
-    if (sysbg.Red() == colour.Red() &&
-        sysbg.Green() == colour.Green() &&
-        sysbg.Blue() == colour.Blue())
-    {
-        return FALSE; // FIXME or TRUE?
-    }
+        return false;

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

-        return FALSE;
+        return false;

 
     if (m_windowStyle & wxTE_MULTILINE)
     {
         GdkWindow *window = GTK_TEXT(m_text)->text_area;
         if (!window)
 
     if (m_windowStyle & wxTE_MULTILINE)
     {
         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 );


@@ -1229,24 +1120,25 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
     // 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 )

 {
 {

-    /* 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
     if ( m_windowStyle & wxTE_MULTILINE )
     {
         if ( style.IsDefault() )
         {
             // nothing to do

-            return TRUE;
+            return true;

         }
 
         }
 

+        // 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) );
 
         gint l = gtk_text_get_length( GTK_TEXT(m_text) );
 

-        wxCHECK_MSG( start >= 0 && end <= l, FALSE,
+        wxCHECK_MSG( start >= 0 && end <= l, false,

                      _T("invalid range in wxTextCtrl::SetStyle") );
 
         gint old_pos = gtk_editable_get_position( GTK_EDITABLE(m_text) );
                      _T("invalid range in wxTextCtrl::SetStyle") );
 
         gint old_pos = gtk_editable_get_position( GTK_EDITABLE(m_text) );


@@ -1257,52 +1149,38 @@ 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
-
-        GdkFont *font = style.HasFont()
-                            ? style.GetFont().GetInternalFont()
-                            : NULL;
-
-        GdkColor *colFg = style.HasTextColour()
-                            ? style.GetTextColour().GetColor()
-                            : NULL;
+    #endif

 
 

-        GdkColor *colBg = style.HasBackgroundColour()
-                            ? style.GetBackgroundColour().GetColor()
-                            : NULL;
-
-        gtk_text_insert( GTK_TEXT(m_text), font, colFg, colBg, txt, txtlen );
+        // 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
+        wxGtkTextInsert(m_text,
+                        wxTextAttr::Combine(style, m_defaultStyle, this),
+                        txt,
+                        txtlen);

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

-        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::ApplyWidgetStyle()
+void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-        // how ?
-    }
-    else
-    {
-        SetWidgetStyle();
-        gtk_widget_set_style( m_text, m_widgetStyle );
-    }
+    gtk_widget_modify_style(m_text, style);

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


@@ -1379,14 +1257,26 @@ void wxTextCtrl::OnInternalIdle()
             gdk_window_set_cursor( window, cursor.GetCursor() );
     }
 
             gdk_window_set_cursor( window, cursor.GetCursor() );
     }
 

-    UpdateWindowUI();
+    if (g_delayedFocus == this)
+    {
+        if (GTK_WIDGET_REALIZED(m_widget))
+        {
+            gtk_widget_grab_focus( m_widget );
+            g_delayedFocus = NULL;
+        }
+    }
+
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);

 }
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {
     // FIXME should be different for multi-line controls...
     wxSize ret( wxControl::DoGetBestSize() );
 }
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {
     // FIXME should be different for multi-line controls...
     wxSize ret( wxControl::DoGetBestSize() );

-    return wxSize(80, ret.y);
+    wxSize best(80, ret.y);
+    CacheBestSize(best);
+    return best;

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


@@ -1417,7 +1307,10 @@ void wxTextCtrl::Thaw()
 
 GtkAdjustment *wxTextCtrl::GetVAdj() const
 {
 
 GtkAdjustment *wxTextCtrl::GetVAdj() const
 {

-    return HasFlag(wxTE_MULTILINE) ? GTK_TEXT(m_text)->vadj : NULL;
+    if ( !IsMultiLine() )
+        return NULL;
+
+    return GTK_TEXT(m_text)->vadj;

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


@@ -1435,34 +1328,40 @@ 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;

-

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

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

 
     // this is hardcoded to 10 in GTK+ 1.2 (great idea)
 
     // this is hardcoded to 10 in GTK+ 1.2 (great idea)

-    static const int KEY_SCROLL_PIXELS = 10;
+    int diff = 10*lines;

 
 

-    return DoScroll(adj, lines*KEY_SCROLL_PIXELS);
+    return DoScroll(adj, diff);

 }
 
 bool wxTextCtrl::ScrollPages(int pages)
 {
     GtkAdjustment *adj = GetVAdj();
     if ( !adj )
 }
 
 bool wxTextCtrl::ScrollPages(int pages)
 {
     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));
 }
 

+
+// static
+wxVisualAttributes
+wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true);
+}