document IsEmpty()

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 112af870c3f6ddafe47e697b249cb1fdc83985bf..0638f5c1fa9885d1451cfc716e2d6a0235d06ff0 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -11,30 +11,26 @@
 #include "wx/wxprec.h"
 
 #include "wx/textctrl.h"
 #include "wx/wxprec.h"
 
 #include "wx/textctrl.h"

-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/log.h"
-#include "wx/math.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 "wx/strconv.h"
 #include "wx/fontutil.h"        // for wxNativeFontInfo (GetNativeFontInfo())
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>

-#include "wx/math.h"

 
 #include "wx/gtk/private.h"
 #include <gdk/gdkkeysyms.h>
 
 
 #include "wx/gtk/private.h"
 #include <gdk/gdkkeysyms.h>
 

-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern wxCursor   g_globalCursor;
-extern wxWindowGTK *g_delayedFocus;
-

 // ----------------------------------------------------------------------------
 // helpers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // helpers
 // ----------------------------------------------------------------------------


@@ -73,10 +69,9 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
 
     if (attr.HasFont())
     {
 
     if (attr.HasFont())
     {

-        char *font_string;

         PangoFontDescription *font_description = attr.GetFont().GetNativeFontInfo()->description;
         PangoFontDescription *font_description = attr.GetFont().GetNativeFontInfo()->description;

-        font_string = pango_font_description_to_string(font_description);
-        g_snprintf(buf, sizeof(buf), "WXFONT %s", font_string);
+        wxGtkString font_string(pango_font_description_to_string(font_description));
+        g_snprintf(buf, sizeof(buf), "WXFONT %s", font_string.c_str());

         tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
                                          buf );
         if (!tag)
         tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
                                          buf );
         if (!tag)


@@ -84,7 +79,6 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
                                               "font-desc", font_description,
                                               NULL );
         gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
                                               "font-desc", font_description,
                                               NULL );
         gtk_text_buffer_apply_tag (text_buffer, tag, start, end);

-        g_free (font_string);

 
         if (attr.GetFont().GetUnderlined())
         {
 
         if (attr.GetFont().GetUnderlined())
         {


@@ -102,7 +96,7 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
 
     if (attr.HasTextColour())
     {
 
     if (attr.HasTextColour())
     {

-        GdkColor *colFg = attr.GetTextColour().GetColor();
+        const GdkColor *colFg = attr.GetTextColour().GetColor();

         g_snprintf(buf, sizeof(buf), "WXFORECOLOR %d %d %d",
                    colFg->red, colFg->green, colFg->blue);
         tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
         g_snprintf(buf, sizeof(buf), "WXFORECOLOR %d %d %d",
                    colFg->red, colFg->green, colFg->blue);
         tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),


@@ -115,7 +109,7 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
 
     if (attr.HasBackgroundColour())
     {
 
     if (attr.HasBackgroundColour())
     {

-        GdkColor *colBg = attr.GetBackgroundColour().GetColor();
+        const GdkColor *colBg = attr.GetBackgroundColour().GetColor();

         g_snprintf(buf, sizeof(buf), "WXBACKCOLOR %d %d %d",
                    colBg->red, colBg->green, colBg->blue);
         tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
         g_snprintf(buf, sizeof(buf), "WXBACKCOLOR %d %d %d",
                    colBg->red, colBg->green, colBg->blue);
         tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),


@@ -451,11 +445,52 @@ gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
     if (g_isIdle)
         wxapp_install_idle_handler();
 
     if (g_isIdle)
         wxapp_install_idle_handler();
 

-    win->SetModified();
+    if ( win->MarkDirtyOnChange() )
+        win->MarkDirty();
+
+    win->SendTextUpdatedEvent();
+}
+}
+
+//-----------------------------------------------------------------------------
+//  clipboard events: "copy-clipboard", "cut-clipboard", "paste-clipboard"
+//-----------------------------------------------------------------------------

 
 

-    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
+// common part of the event handlers below
+static void
+handle_text_clipboard_callback( GtkWidget *widget, wxTextCtrl *win,
+                                wxEventType eventType, const gchar * signal_name)
+{
+    wxClipboardTextEvent event( eventType, win->GetId() );

     event.SetEventObject( win );
     event.SetEventObject( win );

-    win->GetEventHandler()->ProcessEvent( event );
+    if ( win->GetEventHandler()->ProcessEvent( event ) )
+    {
+        // don't let the default processing to take place if we did something
+        // ourselves in the event handler
+        g_signal_stop_emission_by_name (widget, signal_name);
+    }
+}
+
+extern "C" {
+static void
+gtk_copy_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
+{
+    handle_text_clipboard_callback(
+        widget, win, wxEVT_COMMAND_TEXT_COPY, "copy-clipboard" );
+}
+
+static void
+gtk_cut_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
+{
+    handle_text_clipboard_callback(
+        widget, win, wxEVT_COMMAND_TEXT_CUT, "cut-clipboard" );
+}
+
+static void
+gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
+{
+    handle_text_clipboard_callback(
+        widget, win, wxEVT_COMMAND_TEXT_PASTE, "paste-clipboard" );

 }
 }
 
 }
 }
 


@@ -476,9 +511,9 @@ gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl
 //  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)


@@ -506,11 +541,14 @@ END_EVENT_TABLE()
 
 void wxTextCtrl::Init()
 {
 
 void wxTextCtrl::Init()
 {

-    m_ignoreNextUpdate =
+    m_dontMarkDirty =

     m_modified = false;
     m_modified = false;

+
+    m_countUpdatesToIgnore = 0;
+

     SetUpdateFont(false);
     SetUpdateFont(false);

-    m_text =
-    m_vScrollbar = (GtkWidget *)NULL;
+
+    m_text = NULL;

     m_frozenness = 0;
     m_gdkHandCursor = NULL;
     m_gdkXTermCursor = NULL;
     m_frozenness = 0;
     m_gdkHandCursor = NULL;
     m_gdkXTermCursor = NULL;


@@ -557,9 +595,6 @@ bool wxTextCtrl::Create( wxWindow *parent,
         return false;
     }
 
         return false;
     }
 

-
-    m_vScrollbarVisible = false;
-

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


@@ -573,6 +608,8 @@ bool wxTextCtrl::Create( wxWindow *parent,
         m_widget = gtk_scrolled_window_new( NULL, NULL );
         gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( m_widget ),
                                         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
         m_widget = gtk_scrolled_window_new( NULL, NULL );
         gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( m_widget ),
                                         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );

+        // for ScrollLines/Pages
+        m_scrollBar[1] = (GtkRange*)((GtkScrolledWindow*)m_widget)->vscrollbar;

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


@@ -600,8 +637,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
         gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );
 
 
         gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );
 

-        if (!HasFlag(wxNO_BORDER))
-            gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );
+        GtkScrolledWindowSetBorder(m_widget, style);

 
         gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK );
 
 
         gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK );
 


@@ -614,7 +650,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
         m_text = gtk_entry_new();
 
         if (style & wxNO_BORDER)
         m_text = gtk_entry_new();
 
         if (style & wxNO_BORDER)

-            g_object_set( GTK_ENTRY(m_text), "has-frame", FALSE, NULL );
+            g_object_set (m_text, "has-frame", FALSE, NULL);

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


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

-        SetVScrollAdjustment(gtk_scrolled_window_get_vadjustment((GtkScrolledWindow*)m_widget));

     }
 
     if (!value.empty())
     }
 
     if (!value.empty())


@@ -718,6 +753,13 @@ bool wxTextCtrl::Create( wxWindow *parent,
                           G_CALLBACK (gtk_text_changed_callback), this);
     }
 
                           G_CALLBACK (gtk_text_changed_callback), this);
     }
 

+    g_signal_connect (m_text, "copy-clipboard",
+                      G_CALLBACK (gtk_copy_clipboard_callback), this);
+    g_signal_connect (m_text, "cut-clipboard",
+                      G_CALLBACK (gtk_cut_clipboard_callback), this);
+    g_signal_connect (m_text, "paste-clipboard",
+                      G_CALLBACK (gtk_paste_clipboard_callback), this);
+

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


@@ -736,65 +778,97 @@ wxString wxTextCtrl::GetValue() const
     wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );
 
     wxString tmp;
     wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );
 
     wxString tmp;

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

     {
         GtkTextIter start;
         gtk_text_buffer_get_start_iter( m_buffer, &start );
         GtkTextIter end;
         gtk_text_buffer_get_end_iter( m_buffer, &end );
     {
         GtkTextIter start;
         gtk_text_buffer_get_start_iter( m_buffer, &start );
         GtkTextIter end;
         gtk_text_buffer_get_end_iter( m_buffer, &end );

-        gchar *text = gtk_text_buffer_get_text( m_buffer, &start, &end, TRUE );
+        wxGtkString text(gtk_text_buffer_get_text(m_buffer, &start, &end, true));

 
 

-#if wxUSE_UNICODE
-        wxWCharBuffer buffer( wxConvUTF8.cMB2WX( text ) );
-#else
-        wxCharBuffer buffer( wxConvLocal.cWC2WX( wxConvUTF8.cMB2WC( text ) ) );
-#endif
-        if ( buffer )
-            tmp = buffer;
-
-        g_free( text );
+        const wxWxCharBuffer buf = wxGTK_CONV_BACK(text);
+        if ( buf )
+            tmp = buf;

     }
     else
     {
     }
     else
     {

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

     }
 
     return tmp;
 }
 
     }
 
     return tmp;
 }
 

-void wxTextCtrl::SetValue( const wxString &value )
+wxFontEncoding wxTextCtrl::GetTextEncoding() const
+{
+    // GTK+ uses UTF-8 internally, we need to convert to it but from which
+    // encoding?
+
+    // first check the default text style (we intentionally don't check the
+    // style for the current position as it doesn't make sense for SetValue())
+    const wxTextAttr& style = GetDefaultStyle();
+    wxFontEncoding enc = style.HasFont() ? style.GetFont().GetEncoding()
+                                         : wxFONTENCODING_SYSTEM;
+
+    // fall back to the controls font if no style
+    if ( enc == wxFONTENCODING_SYSTEM && m_hasFont )
+        enc = GetFont().GetEncoding();
+
+    return enc;
+}
+
+bool wxTextCtrl::IsEmpty() const
+{
+    if ( IsMultiLine() )
+        return gtk_text_buffer_get_char_count(m_buffer) != 0;
+
+    return wxTextCtrlBase::IsEmpty();
+}
+
+void wxTextCtrl::DoSetValue( const wxString &value, int flags )

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

-    if (m_windowStyle & wxTE_MULTILINE)
+    // the control won't be modified any more as we programmatically replace
+    // all the existing text, so reset the flag and don't set it again (and do
+    // it now, before the text event handler is ran so that IsModified() called
+    // from there returns the expected value)
+    m_modified = false;
+    DontMarkDirtyOnNextChange();
+
+    const wxCharBuffer buffer(wxGTK_CONV_ENC(value, GetTextEncoding()));
+    if ( !buffer )

     {
     {

-#if wxUSE_UNICODE
-        wxCharBuffer buffer( wxConvUTF8.cWX2MB( value) );
-#else
-        wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) );
-#endif
-        if (gtk_text_buffer_get_char_count(m_buffer) != 0)
-            IgnoreNextTextUpdate();
+        // see comment in WriteText() as to why we must warn the user about
+        // this
+        wxLogWarning(_("Failed to set text in the text control."));
+        return;
+    }

 
 

-        if ( !buffer )
-        {
-            // what else can we do? at least don't crash...
-            return;
-        }
+    // if the control is not empty, two "changed" signals are emitted,
+    // otherwise only one and we need to ignore either both or one of them
+    int ignore = flags & SetValue_SendEvent ? 0 : 1;
+    if ( !IsEmpty() )
+        ignore++;
+
+    if ( ignore )
+        IgnoreNextTextUpdate(ignore);

 
 

+    if ( IsMultiLine() )
+    {

         gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
     }
         gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
     }

-    else
+    else // single line

     {
     {

-        gtk_entry_set_text( GTK_ENTRY(m_text), wxGTK_CONV( value ) );
+        gtk_entry_set_text( GTK_ENTRY(m_text), buffer );

     }
 
     // GRG, Jun/2000: Changed this after a lot of discussion in
     //   the lists. wxWidgets 2.2 will have a set of flags to
     //   customize this behaviour.
     SetInsertionPoint(0);
     }
 
     // GRG, Jun/2000: Changed this after a lot of discussion in
     //   the lists. wxWidgets 2.2 will have a set of flags to
     //   customize this behaviour.
     SetInsertionPoint(0);

-
-    m_modified = false;

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


@@ -804,25 +878,40 @@ void wxTextCtrl::WriteText( const wxString &text )
     if ( text.empty() )
         return;
 
     if ( text.empty() )
         return;
 

-    // 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;
+    // check if we have a specific style for the current position
+    wxFontEncoding enc = wxFONTENCODING_SYSTEM;
+    wxTextAttr style;
+    if ( GetStyle(GetInsertionPoint(), style) && style.HasFont() )
+    {
+        enc = style.GetFont().GetEncoding();
+    }
+
+    if ( enc == wxFONTENCODING_SYSTEM )
+        enc = GetTextEncoding();

 
 

-    if ( m_windowStyle & wxTE_MULTILINE )
+    const wxCharBuffer buffer(wxGTK_CONV_ENC(text, enc));
+    if ( !buffer )

     {
     {

-#if wxUSE_UNICODE
-        wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
-#else
-        wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
-#endif
-        if ( !buffer )
-        {
-            // what else can we do? at least don't crash...
-            return;
-        }
+        // we must log an error here as losing the text like this can be a
+        // serious problem (e.g. imagine the document edited by user being
+        // empty instead of containing the correct text)
+        wxLogWarning(_("Failed to insert text in the control."));
+        return;
+    }
+
+    // we're changing the text programmatically
+    DontMarkDirtyOnNextChange();

 
 

-        // TODO: Call whatever is needed to delete the selection.
+    if ( IsMultiLine() )
+    {
+        // First remove the selection if there is one
+        // TODO:  Is there an easier GTK specific way to do this?
+        long from, to;
+        GetSelection(&from, &to);
+        if (from != to)
+            Remove(from, to);
+
+        // Insert the text

         wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );
 
         GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(m_widget) );
         wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );
 
         GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(m_widget) );


@@ -841,24 +930,11 @@ void wxTextCtrl::WriteText( const wxString &text )
         // This moves the cursor pos to behind the inserted text.
         gint len = gtk_editable_get_position(GTK_EDITABLE(m_text));
 
         // This moves the cursor pos to behind the inserted text.
         gint len = gtk_editable_get_position(GTK_EDITABLE(m_text));
 

-#if wxUSE_UNICODE
-        wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
-#else
-        wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
-#endif
-        if ( !buffer )
-        {
-            // what else can we do? at least don't crash...
-            return;
-        }
-

         gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
 
         // Bring entry's cursor uptodate.
         gtk_editable_set_position( GTK_EDITABLE(m_text), len );
     }
         gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
 
         // Bring entry's cursor uptodate.
         gtk_editable_set_position( GTK_EDITABLE(m_text), len );
     }

-
-    m_modified = oldModified;

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


@@ -869,22 +945,22 @@ void wxTextCtrl::AppendText( const wxString &text )
 
 wxString wxTextCtrl::GetLineText( long lineNo ) const
 {
 
 wxString wxTextCtrl::GetLineText( long lineNo ) const
 {

-    if (m_windowStyle & wxTE_MULTILINE)
+    wxString result;
+    if ( IsMultiLine() )

     {
         GtkTextIter line;
         gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo);
         GtkTextIter end = line;
         gtk_text_iter_forward_to_line_end(&end);
     {
         GtkTextIter line;
         gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo);
         GtkTextIter end = line;
         gtk_text_iter_forward_to_line_end(&end);

-        gchar *text = gtk_text_buffer_get_text(m_buffer,&line,&end,TRUE);
-        wxString result(wxGTK_CONV_BACK(text));
-        g_free(text);
-        return result;
+        wxGtkString text(gtk_text_buffer_get_text(m_buffer, &line, &end, true));
+        result = wxGTK_CONV_BACK(text);

     }
     else
     {
     }
     else
     {

-        if (lineNo == 0) return GetValue();
-        return wxEmptyString;
+        if (lineNo == 0)
+            result = GetValue();

     }
     }

+    return result;

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


@@ -896,22 +972,28 @@ void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
 
 bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
 {
 
 bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
 {

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

     {
         GtkTextIter iter;
     {
         GtkTextIter iter;

-        gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos);
-        if (gtk_text_iter_is_end(&iter))
+
+        if (pos > GetLastPosition())

             return false;
 
             return false;
 

-        *y = gtk_text_iter_get_line(&iter);
-        *x = gtk_text_iter_get_line_offset(&iter);
+        gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos);
+
+        if ( y )
+            *y = gtk_text_iter_get_line(&iter);
+        if ( x )
+            *x = gtk_text_iter_get_line_offset(&iter);

     }
     else // single line control
     {
         if ( pos <= GTK_ENTRY(m_text)->text_length )
         {
     }
     else // single line control
     {
         if ( pos <= GTK_ENTRY(m_text)->text_length )
         {

-            *y = 0;
-            *x = pos;
+            if ( y )
+                *y = 0;
+            if ( x )
+                *x = pos;

         }
         else
         {
         }
         else
         {


@@ -925,7 +1007,8 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
 
 long wxTextCtrl::XYToPosition(long x, long y ) const
 {
 
 long wxTextCtrl::XYToPosition(long x, long y ) const
 {

-    if (!(m_windowStyle & wxTE_MULTILINE)) return 0;
+    if ( IsSingleLine() )
+        return 0;

 
     GtkTextIter iter;
     if (y >= gtk_text_buffer_get_line_count (m_buffer))
 
     GtkTextIter iter;
     if (y >= gtk_text_buffer_get_line_count (m_buffer))


@@ -940,7 +1023,7 @@ long wxTextCtrl::XYToPosition(long x, long y ) const
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 {

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

     {
         int last_line = gtk_text_buffer_get_line_count( m_buffer ) - 1;
         if (lineNo > last_line)
     {
         int last_line = gtk_text_buffer_get_line_count( m_buffer ) - 1;
         if (lineNo > last_line)


@@ -960,7 +1043,7 @@ int wxTextCtrl::GetLineLength(long lineNo) const
 
 int wxTextCtrl::GetNumberOfLines() const
 {
 
 int wxTextCtrl::GetNumberOfLines() const
 {

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

     {
         GtkTextIter iter;
         gtk_text_buffer_get_iter_at_offset( m_buffer, &iter, 0 );
     {
         GtkTextIter iter;
         gtk_text_buffer_get_iter_at_offset( m_buffer, &iter, 0 );


@@ -1020,7 +1103,7 @@ void wxTextCtrl::SetInsertionPointEnd()
 {
     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() )

     {
         GtkTextIter end;
         gtk_text_buffer_get_end_iter( m_buffer, &end );
     {
         GtkTextIter end;
         gtk_text_buffer_get_end_iter( m_buffer, &end );


@@ -1036,7 +1119,7 @@ void wxTextCtrl::SetEditable( bool editable )
 {
     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() )

     {
         gtk_text_view_set_editable( GTK_TEXT_VIEW(m_text), editable );
     }
     {
         gtk_text_view_set_editable( GTK_TEXT_VIEW(m_text), editable );
     }


@@ -1054,7 +1137,7 @@ bool wxTextCtrl::Enable( bool enable )
         return false;
     }
 
         return false;
     }
 

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

     {
         SetEditable( enable );
     }
     {
         SetEditable( enable );
     }


@@ -1100,16 +1183,11 @@ void wxTextCtrl::DiscardEdits()
 // max text length support
 // ----------------------------------------------------------------------------
 
 // max text length support
 // ----------------------------------------------------------------------------
 

-void wxTextCtrl::IgnoreNextTextUpdate()
-{
-    m_ignoreNextUpdate = true;
-}
-

 bool wxTextCtrl::IgnoreTextUpdate()
 {
 bool wxTextCtrl::IgnoreTextUpdate()
 {

-    if ( m_ignoreNextUpdate )
+    if ( m_countUpdatesToIgnore > 0 )

     {
     {

-        m_ignoreNextUpdate = false;
+        m_countUpdatesToIgnore--;

 
         return true;
     }
 
         return true;
     }


@@ -1117,6 +1195,18 @@ bool wxTextCtrl::IgnoreTextUpdate()
     return false;
 }
 
     return false;
 }
 

+bool wxTextCtrl::MarkDirtyOnChange()
+{
+    if ( m_dontMarkDirty )
+    {
+        m_dontMarkDirty = false;
+
+        return false;
+    }
+
+    return true;
+}
+

 void wxTextCtrl::SetMaxLength(unsigned long len)
 {
     if ( !HasFlag(wxTE_MULTILINE) )
 void wxTextCtrl::SetMaxLength(unsigned long len)
 {
     if ( !HasFlag(wxTE_MULTILINE) )


@@ -1155,7 +1245,7 @@ void wxTextCtrl::SetSelection( long from, long to )
         to = GetValue().length();
     }
 
         to = GetValue().length();
     }
 

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

     {
         GtkTextIter fromi, toi;
         gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from );
     {
         GtkTextIter fromi, toi;
         gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from );


@@ -1172,7 +1262,7 @@ void wxTextCtrl::SetSelection( long from, long to )
 
 void wxTextCtrl::ShowPosition( long pos )
 {
 
 void wxTextCtrl::ShowPosition( long pos )
 {

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

     {
         GtkTextIter iter;
         gtk_text_buffer_get_start_iter( m_buffer, &iter );
     {
         GtkTextIter iter;
         gtk_text_buffer_get_start_iter( m_buffer, &iter );


@@ -1212,7 +1302,7 @@ long wxTextCtrl::GetInsertionPoint() const
 {
     wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
 
 {
     wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
 

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

     {
         // There is no direct accessor for the cursor, but
         // internally, the cursor is the "mark" called
     {
         // There is no direct accessor for the cursor, but
         // internally, the cursor is the "mark" called


@@ -1236,7 +1326,7 @@ wxTextPos wxTextCtrl::GetLastPosition() const
 
     int pos = 0;
 
 
     int pos = 0;
 

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

     {
         GtkTextIter end;
         gtk_text_buffer_get_end_iter( m_buffer, &end );
     {
         GtkTextIter end;
         gtk_text_buffer_get_end_iter( m_buffer, &end );


@@ -1255,7 +1345,7 @@ void wxTextCtrl::Remove( long from, long to )
 {
     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() )

     {
         GtkTextIter fromi, toi;
         gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from );
     {
         GtkTextIter fromi, toi;
         gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from );


@@ -1284,7 +1374,7 @@ void wxTextCtrl::Cut()
 {
     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() )

         g_signal_emit_by_name (m_text, "cut-clipboard");
     else
         gtk_editable_cut_clipboard(GTK_EDITABLE(m_text));
         g_signal_emit_by_name (m_text, "cut-clipboard");
     else
         gtk_editable_cut_clipboard(GTK_EDITABLE(m_text));


@@ -1294,7 +1384,7 @@ void wxTextCtrl::Copy()
 {
     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() )

         g_signal_emit_by_name (m_text, "copy-clipboard");
     else
         gtk_editable_copy_clipboard(GTK_EDITABLE(m_text));
         g_signal_emit_by_name (m_text, "copy-clipboard");
     else
         gtk_editable_copy_clipboard(GTK_EDITABLE(m_text));


@@ -1304,7 +1394,7 @@ void wxTextCtrl::Paste()
 {
     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() )

         g_signal_emit_by_name (m_text, "paste-clipboard");
     else
         gtk_editable_paste_clipboard(GTK_EDITABLE(m_text));
         g_signal_emit_by_name (m_text, "paste-clipboard");
     else
         gtk_editable_paste_clipboard(GTK_EDITABLE(m_text));


@@ -1347,7 +1437,7 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
     gint to = -1;
     bool haveSelection = false;
 
     gint to = -1;
     bool haveSelection = false;
 

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

      {
          GtkTextIter ifrom, ito;
          if ( gtk_text_buffer_get_selection_bounds(m_buffer, &ifrom, &ito) )
      {
          GtkTextIter ifrom, ito;
          if ( gtk_text_buffer_get_selection_bounds(m_buffer, &ifrom, &ito) )


@@ -1388,7 +1478,7 @@ bool wxTextCtrl::IsEditable() const
 {
     wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
 
 {
     wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
 

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

     {
         return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text));
     }
     {
         return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text));
     }


@@ -1412,31 +1502,37 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

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

     {
     {

-        wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
-        event.SetEventObject(this);
-        event.SetString(GetValue());
-        if (GetEventHandler()->ProcessEvent(event)) return;
-    }
-
-    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();
+        if ( HasFlag(wxTE_PROCESS_ENTER) )
+        {
+            wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+            event.SetEventObject(this);
+            event.SetString(GetValue());
+            if ( GetEventHandler()->ProcessEvent(event) )
+                return;
+        }

 
 

-        if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))
+        // FIXME: this is not the right place to do it, wxDialog::OnCharHook()
+        //        probably is
+        if ( IsSingleLine() )

         {
         {

-            GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
+            // This will invoke the dialog default action, such
+            // as the clicking the default button.

 
 

-            if (window->default_widget)
+            wxWindow *top_frame = m_parent;
+            while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
+                top_frame = top_frame->GetParent();
+
+            if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))

             {
             {

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

             }
         }
     }
             }
         }
     }


@@ -1449,15 +1545,16 @@ GtkWidget* wxTextCtrl::GetConnectWidget()
     return GTK_WIDGET(m_text);
 }
 
     return GTK_WIDGET(m_text);
 }
 

-bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxTextCtrl::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
 {

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

     {
     {

-        return window == gtk_text_view_get_window( GTK_TEXT_VIEW( m_text ), GTK_TEXT_WINDOW_TEXT );  // pure guesswork
+        return gtk_text_view_get_window(GTK_TEXT_VIEW(m_text),
+                                        GTK_TEXT_WINDOW_TEXT );

     }
     else
     {
     }
     else
     {

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

     }
 }
 
     }
 }
 


@@ -1472,7 +1569,7 @@ bool wxTextCtrl::SetFont( const wxFont &font )
         return false;
     }
 
         return false;
     }
 

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

     {
         SetUpdateFont(true);
 
     {
         SetUpdateFont(true);
 


@@ -1490,7 +1587,7 @@ void wxTextCtrl::ChangeFontGlobally()
     // possible!
     //
     // TODO: it can be implemented much more efficiently for GTK2
     // possible!
     //
     // TODO: it can be implemented much more efficiently for GTK2

-    wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE),
+    wxASSERT_MSG( IsMultiLine(),

                   _T("shouldn't be called for single line controls") );
 
     wxString value = GetValue();
                   _T("shouldn't be called for single line controls") );
 
     wxString value = GetValue();


@@ -1532,7 +1629,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 
 bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
 {
 
 bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
 {

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

     {
         if ( style.IsDefault() )
         {
     {
         if ( style.IsDefault() )
         {


@@ -1619,24 +1716,6 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
     event.Enable( CanRedo() );
 }
 
     event.Enable( CanRedo() );
 }
 

-void wxTextCtrl::OnInternalIdle()
-{
-    wxCursor cursor = m_cursor;
-    if (g_globalCursor.Ok()) cursor = g_globalCursor;
-
-    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 wxTextCtrl::DoGetBestSize() const
 {
     // FIXME should be different for multi-line controls...


@@ -1698,7 +1777,7 @@ void wxTextCtrl::Thaw()
 void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event)
 {
     event.Skip();
 void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event)
 {
     event.Skip();

-    if(!(m_windowStyle & wxTE_AUTO_URL))
+    if( !HasFlag(wxTE_AUTO_URL) )

         return;
 
     gint x, y;
         return;
 
     gint x, y;


@@ -1741,6 +1820,18 @@ void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event)
     GetEventHandler()->ProcessEvent(url_event);
 }
 
     GetEventHandler()->ProcessEvent(url_event);
 }
 

+bool wxTextCtrl::GTKProcessEvent(wxEvent& event) const
+{
+    bool rc = wxTextCtrlBase::GTKProcessEvent(event);
+
+    // GtkTextView starts a drag operation when left mouse button is pressed
+    // and ends it when it is released and if it doesn't get the release event
+    // the next click on a control results in an assertion failure inside
+    // gtk_text_view_start_selection_drag() which simply *kills* the program
+    // without anything we can do about it, so always let GTK+ have this event
+    return rc && (IsSingleLine() || event.GetEventType() != wxEVT_LEFT_UP);
+}
+

 // static
 wxVisualAttributes
 wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 // static
 wxVisualAttributes
 wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))