Forgot to free string after usage.

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index c25849b6553e8cecadaf1a2355b8620c36eebcce..b8e19bb2e68dd6b71f0f2c3023abb059f65a18d1 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -26,7 +26,7 @@
 #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 "wx/math.h"

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


@@ -202,10 +202,21 @@ gtk_text_changed_callback( GtkWidget *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 );
 }
 

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

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


@@ -281,10 +292,13 @@ END_EVENT_TABLE()
 void wxTextCtrl::Init()
 {
     m_ignoreNextUpdate =
 void wxTextCtrl::Init()
 {
     m_ignoreNextUpdate =

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

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

+#ifdef __WXGTK20__
+    m_frozenness = 0;
+#endif

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


@@ -310,32 +324,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;
 

-#ifdef __WXGTK20__
-    GtkTextBuffer *buffer = NULL;
-#endif
-

     if (multi_line)
     {
 #ifdef __WXGTK20__
         // Create view
         m_text = gtk_text_view_new();
 
     if (multi_line)
     {
 #ifdef __WXGTK20__
         // Create view
         m_text = gtk_text_view_new();
 

-        buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
+        m_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );

 
         // create scrolled window
         m_widget = gtk_scrolled_window_new( NULL, NULL );
 
         // create scrolled window
         m_widget = gtk_scrolled_window_new( NULL, NULL );


@@ -353,14 +363,14 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
         if (!HasFlag(wxNO_BORDER))
             gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );
 
         if (!HasFlag(wxNO_BORDER))
             gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );

-            
+

         GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 #else
         // create our control ...
         m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
 
         // ... and put into the upper left hand corner of the table
         GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 #else
         // create our control ...
         m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
 
         // ... and put into the upper left hand corner of the table

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

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


@@ -385,6 +395,11 @@ bool wxTextCtrl::Create( wxWindow *parent,
         // a single-line text control: no need for scrollbars
         m_widget =
         m_text = gtk_entry_new();
         // a single-line text control: no need for scrollbars
         m_widget =
         m_text = gtk_entry_new();

+
+#ifdef __WXGTK20__
+        if (style & wxNO_BORDER)
+            g_object_set( GTK_ENTRY(m_text), "has-frame", FALSE, NULL );
+#endif

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


@@ -416,7 +431,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
     }
 #endif // GTK+ 1.x
 
     }
 #endif // GTK+ 1.x
 

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

     {
 #ifdef __WXGTK20__
         SetValue( value );
     {
 #ifdef __WXGTK20__
         SetValue( value );


@@ -476,28 +491,31 @@ bool wxTextCtrl::Create( wxWindow *parent,
             gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_CENTER );
         // Left justify (alignment) is the default and we don't need to apply GTK_JUSTIFY_LEFT
     }
             gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_CENTER );
         // Left justify (alignment) is the default and we don't need to apply GTK_JUSTIFY_LEFT
     }

-    // gtk_entry_set_alignment was introduced in gtk+-2.3.5
-#if GTK_CHECK_VERSION(2, 3, 5)

     else
     {
     else
     {

-        if (style & wxTE_RIGHT)
-            gtk_entry_set_alignment( GTK_ENTRY(m_text), 1.0 );
-        else if (style & wxTE_CENTRE)
-            gtk_entry_set_alignment( GTK_ENTRY(m_text), 0.5 );
+#ifdef __WXGTK24__
+        // gtk_entry_set_alignment was introduced in gtk+-2.3.5
+        if (!gtk_check_version(2,4,0))
+        {
+            if (style & wxTE_RIGHT)
+                gtk_entry_set_alignment( GTK_ENTRY(m_text), 1.0 );
+            else if (style & wxTE_CENTRE)
+                gtk_entry_set_alignment( GTK_ENTRY(m_text), 0.5 );
+        }
+#endif

     }
     }

-#endif // gtk+-2.3.5

 #endif // __WXGTK20__
 #endif // __WXGTK20__

-    
+

     // We want to be notified about text changes.
 #ifdef __WXGTK20__
     if (multi_line)
     {
     // We want to be notified about text changes.
 #ifdef __WXGTK20__
     if (multi_line)
     {

-        g_signal_connect( G_OBJECT(buffer), "changed",
+        g_signal_connect( G_OBJECT(m_buffer), "changed",

             GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
     }
     else
 #endif
             GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
     }
     else
 #endif

-    
+

     {
         gtk_signal_connect( GTK_OBJECT(m_text), "changed",
             GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
     {
         gtk_signal_connect( GTK_OBJECT(m_text), "changed",
             GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);


@@ -508,7 +526,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
     wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont());
     SetDefaultStyle( attrDef );
 
     wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont());
     SetDefaultStyle( attrDef );
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -524,7 +542,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


@@ -532,7 +550,7 @@ void wxTextCtrl::CalculateScrollbar()
         if (!m_vScrollbarVisible)
         {
             gtk_widget_show( m_vScrollbar );
         if (!m_vScrollbarVisible)
         {
             gtk_widget_show( m_vScrollbar );

-            m_vScrollbarVisible = TRUE;
+            m_vScrollbarVisible = true;

         }
     }
 #endif
         }
     }
 #endif


@@ -546,13 +564,11 @@ wxString wxTextCtrl::GetValue() const
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifdef __WXGTK20__
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifdef __WXGTK20__

-        GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-

         GtkTextIter start;
         GtkTextIter start;

-        gtk_text_buffer_get_start_iter( text_buffer, &start );
+        gtk_text_buffer_get_start_iter( m_buffer, &start );

         GtkTextIter end;
         GtkTextIter end;

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

 
 #if wxUSE_UNICODE
         wxWCharBuffer buffer( wxConvUTF8.cMB2WX( text ) );
 
 #if wxUSE_UNICODE
         wxWCharBuffer buffer( wxConvUTF8.cMB2WX( text ) );


@@ -591,11 +607,10 @@ void wxTextCtrl::SetValue( const wxString &value )
 #else
         wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) );
 #endif
 #else
         wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) );
 #endif

-        GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-        if (gtk_text_buffer_get_char_count(text_buffer) != 0)
+        if (gtk_text_buffer_get_char_count(m_buffer) != 0)

             IgnoreNextTextUpdate();
 
             IgnoreNextTextUpdate();
 

-        gtk_text_buffer_set_text( text_buffer, buffer, strlen(buffer) );
+        gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );

 
 #else
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
 
 #else
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );


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

-    m_modified = FALSE;
+    m_modified = false;

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


@@ -644,17 +659,15 @@ void wxTextCtrl::WriteText( const wxString &text )
             return;
         }
 
             return;
         }
 

-        GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-

         // TODO: Call whatever is needed to delete the selection.
         // TODO: Call whatever is needed to delete the selection.

-        wxGtkTextInsert( m_text, text_buffer, m_defaultStyle, buffer );
+        wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );

 
         GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(m_widget) );
         // Scroll to cursor, but only if scrollbar thumb is at the very bottom
         if ( adj->value == adj->upper - adj->page_size )
         {
             gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text),
 
         GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(m_widget) );
         // Scroll to cursor, but only if scrollbar thumb is at the very bottom
         if ( adj->value == adj->upper - adj->page_size )
         {
             gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text),

-                    gtk_text_buffer_get_insert( text_buffer ), 0.0, FALSE, 0.0, 1.0 );
+                    gtk_text_buffer_get_insert( m_buffer ), 0.0, FALSE, 0.0, 1.0 );

         }
 #else // GTK 1.x
         // After cursor movements, gtk_text_get_point() is wrong by one.
         }
 #else // GTK 1.x
         // After cursor movements, gtk_text_get_point() is wrong by one.


@@ -670,7 +683,7 @@ void wxTextCtrl::WriteText( const wxString &text )
         // in UpdateFontIfNeeded() any longer
         if ( !text.empty() )
         {
         // in UpdateFontIfNeeded() any longer
         if ( !text.empty() )
         {

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

         }
 
         // Bring editable's cursor back uptodate.
         }
 
         // Bring editable's cursor back uptodate.


@@ -740,13 +753,11 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
             return wxEmptyString;
         }
 #else
             return wxEmptyString;
         }
 #else

-        GtkTextBuffer *text_buffer;
-        text_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(m_text));

         GtkTextIter line;
         GtkTextIter line;

-        gtk_text_buffer_get_iter_at_line(text_buffer,&line,lineNo);
+        gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo);

         GtkTextIter end;
         GtkTextIter end;

-        gtk_text_buffer_get_end_iter(text_buffer,&end );
-        gchar *text = gtk_text_buffer_get_text(text_buffer,&line,&end,TRUE);
+        gtk_text_buffer_get_end_iter(m_buffer,&end );
+        gchar *text = gtk_text_buffer_get_text(m_buffer,&line,&end,TRUE);

         wxString result(wxGTK_CONV_BACK(text));
         g_free(text);
         return result.BeforeFirst(wxT('\n'));
         wxString result(wxGTK_CONV_BACK(text));
         g_free(text);
         return result.BeforeFirst(wxT('\n'));


@@ -774,7 +785,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
 
         // cast to prevent warning. But pos really should've been unsigned.
         if( (unsigned long)pos > text.Len()  )
 
         // cast to prevent warning. But pos really should've been unsigned.
         if( (unsigned long)pos > text.Len()  )

-            return FALSE;
+            return false;

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


@@ -801,11 +812,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


@@ -830,9 +841,7 @@ int wxTextCtrl::GetNumberOfLines() const
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifdef __WXGTK20__
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifdef __WXGTK20__

-        GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-
-        return gtk_text_buffer_get_line_count( buffer );
+        return gtk_text_buffer_get_line_count( m_buffer );

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


@@ -869,14 +878,13 @@ void wxTextCtrl::SetInsertionPoint( long pos )
     if ( IsMultiLine() )
     {
 #ifdef __WXGTK20__
     if ( IsMultiLine() )
     {
 #ifdef __WXGTK20__

-        GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );

         GtkTextIter iter;
         GtkTextIter iter;

-        gtk_text_buffer_get_iter_at_offset( text_buffer, &iter, pos );
-        gtk_text_buffer_place_cursor( text_buffer, &iter );
+        gtk_text_buffer_get_iter_at_offset( m_buffer, &iter, pos );
+        gtk_text_buffer_place_cursor( m_buffer, &iter );

         gtk_text_view_scroll_mark_onscreen
         (
             GTK_TEXT_VIEW(m_text),
         gtk_text_view_scroll_mark_onscreen
         (
             GTK_TEXT_VIEW(m_text),

-            gtk_text_buffer_get_insert( text_buffer )
+            gtk_text_buffer_get_insert( m_buffer )

         );
 #else // GTK+ 1.x
         gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
         );
 #else // GTK+ 1.x
         gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),


@@ -913,10 +921,9 @@ void wxTextCtrl::SetInsertionPointEnd()
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifdef __WXGTK20__
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifdef __WXGTK20__

-        GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );

         GtkTextIter end;
         GtkTextIter end;

-        gtk_text_buffer_get_end_iter( text_buffer, &end );
-        gtk_text_buffer_place_cursor( text_buffer, &end );
+        gtk_text_buffer_get_end_iter( m_buffer, &end );
+        gtk_text_buffer_place_cursor( m_buffer, &end );

 #else
         SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text)));
 #endif
 #else
         SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text)));
 #endif


@@ -950,7 +957,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)


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


@@ -992,12 +999,12 @@ void wxTextCtrl::OnParentEnable( bool enable )
 
 void wxTextCtrl::MarkDirty()
 {
 
 void wxTextCtrl::MarkDirty()
 {

-    m_modified = TRUE;
+    m_modified = true;

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

-    m_modified = FALSE;
+    m_modified = false;

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


@@ -1006,19 +1013,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)


@@ -1078,14 +1085,12 @@ void wxTextCtrl::SetSelection( long from, long to )
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifdef __WXGTK20__
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifdef __WXGTK20__

-        GtkTextBuffer *buf = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-

         GtkTextIter fromi, toi;
         GtkTextIter fromi, toi;

-        gtk_text_buffer_get_iter_at_offset( buf, &fromi, from );
-        gtk_text_buffer_get_iter_at_offset( buf, &toi, to );
+        gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from );
+        gtk_text_buffer_get_iter_at_offset( m_buffer, &toi, to );

 
 

-        gtk_text_buffer_place_cursor( buf, &toi );
-        gtk_text_buffer_move_mark_by_name( buf, "selection_bound", &fromi );
+        gtk_text_buffer_place_cursor( m_buffer, &toi );
+        gtk_text_buffer_move_mark_by_name( m_buffer, "selection_bound", &fromi );

 #else
         gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 #endif
 #else
         gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 #endif


@@ -1101,11 +1106,10 @@ void wxTextCtrl::ShowPosition( long pos )
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifdef __WXGTK20__
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifdef __WXGTK20__

-        GtkTextBuffer *buf = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );

         GtkTextIter iter;
         GtkTextIter iter;

-        gtk_text_buffer_get_start_iter( buf, &iter );
+        gtk_text_buffer_get_start_iter( m_buffer, &iter );

         gtk_text_iter_set_offset( &iter, pos );
         gtk_text_iter_set_offset( &iter, pos );

-        GtkTextMark *mark = gtk_text_buffer_create_mark( buf, NULL, &iter, TRUE );
+        GtkTextMark *mark = gtk_text_buffer_create_mark( m_buffer, NULL, &iter, TRUE );

         gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text), mark, 0.0, FALSE, 0.0, 0.0 );
 #else // GTK 1.x
         GtkAdjustment *vp = GTK_TEXT(m_text)->vadj;
         gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text), mark, 0.0, FALSE, 0.0, 0.0 );
 #else // GTK 1.x
         GtkAdjustment *vp = GTK_TEXT(m_text)->vadj;


@@ -1157,15 +1161,13 @@ long wxTextCtrl::GetInsertionPoint() const
 #ifdef __WXGTK20__
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifdef __WXGTK20__
     if (m_windowStyle & wxTE_MULTILINE)
     {

-        GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-

         // There is no direct accessor for the cursor, but
         // internally, the cursor is the "mark" called
         // "insert" in the text view's btree structure.
 
         // There is no direct accessor for the cursor, but
         // internally, the cursor is the "mark" called
         // "insert" in the text view's btree structure.
 

-        GtkTextMark *mark = gtk_text_buffer_get_insert( text_buffer );
+        GtkTextMark *mark = gtk_text_buffer_get_insert( m_buffer );

         GtkTextIter cursor;
         GtkTextIter cursor;

-        gtk_text_buffer_get_iter_at_mark( text_buffer, &cursor, mark );
+        gtk_text_buffer_get_iter_at_mark( m_buffer, &cursor, mark );

 
         return gtk_text_iter_get_offset( &cursor );
     }
 
         return gtk_text_iter_get_offset( &cursor );
     }


@@ -1176,7 +1178,7 @@ long wxTextCtrl::GetInsertionPoint() const
     }
 }
 
     }
 }
 

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

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


@@ -1185,9 +1187,8 @@ long wxTextCtrl::GetLastPosition() const
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifdef __WXGTK20__
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifdef __WXGTK20__

-        GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );

         GtkTextIter end;
         GtkTextIter end;

-        gtk_text_buffer_get_end_iter( text_buffer, &end );
+        gtk_text_buffer_get_end_iter( m_buffer, &end );

 
         pos = gtk_text_iter_get_offset( &end );
 #else
 
         pos = gtk_text_iter_get_offset( &end );
 #else


@@ -1209,14 +1210,11 @@ void wxTextCtrl::Remove( long from, long to )
 #ifdef __WXGTK20__
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifdef __WXGTK20__
     if (m_windowStyle & wxTE_MULTILINE)
     {

-        GtkTextBuffer *
-            text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-

         GtkTextIter fromi, toi;
         GtkTextIter fromi, toi;

-        gtk_text_buffer_get_iter_at_offset( text_buffer, &fromi, from );
-        gtk_text_buffer_get_iter_at_offset( text_buffer, &toi, to );
+        gtk_text_buffer_get_iter_at_offset( m_buffer, &fromi, from );
+        gtk_text_buffer_get_iter_at_offset( m_buffer, &toi, to );

 
 

-        gtk_text_buffer_delete( text_buffer, &fromi, &toi );
+        gtk_text_buffer_delete( m_buffer, &fromi, &toi );

     }
     else // single line
 #endif
     }
     else // single line
 #endif


@@ -1229,7 +1227,7 @@ void wxTextCtrl::Replace( long from, long to, const wxString &value )
 
     Remove( from, to );
 
 
     Remove( from, to );
 

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

     {
 #ifdef __WXGTK20__
         SetInsertionPoint( from );
     {
 #ifdef __WXGTK20__
         SetInsertionPoint( from );


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

-    return FALSE;
+    return false;

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

-    return FALSE;
+    return false;

 }
 
 // If the return values from and to are the same, there is no
 }
 
 // If the return values from and to are the same, there is no


@@ -1317,16 +1315,15 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
 
     gint from = -1;
     gint to = -1;
 
     gint from = -1;
     gint to = -1;

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

 
 #ifdef __WXGTK20__
      if (m_windowStyle & wxTE_MULTILINE)
      {
 
 #ifdef __WXGTK20__
      if (m_windowStyle & wxTE_MULTILINE)
      {

-         GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (m_text));

          GtkTextIter ifrom, ito;
          GtkTextIter ifrom, ito;

-         if ( gtk_text_buffer_get_selection_bounds(buffer, &ifrom, &ito) )
+         if ( gtk_text_buffer_get_selection_bounds(m_buffer, &ifrom, &ito) )

          {
          {

-             haveSelection = TRUE;
+             haveSelection = true;

              from = gtk_text_iter_get_offset(&ifrom);
              to = gtk_text_iter_get_offset(&ito);
          }
              from = gtk_text_iter_get_offset(&ifrom);
              to = gtk_text_iter_get_offset(&ito);
          }


@@ -1336,13 +1333,13 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
          if ( gtk_editable_get_selection_bounds( GTK_EDITABLE(m_text),
                                                  &from, &to) )
          {
          if ( gtk_editable_get_selection_bounds( GTK_EDITABLE(m_text),
                                                  &from, &to) )
          {

-             haveSelection = TRUE;
+             haveSelection = true;

          }
      }
 #else //  not GTK2
      if ( (GTK_EDITABLE(m_text)->has_selection) )
      {
          }
      }
 #else //  not GTK2
      if ( (GTK_EDITABLE(m_text)->has_selection) )
      {

-         haveSelection = TRUE;
+         haveSelection = true;

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


@@ -1368,7 +1365,7 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
 
 bool wxTextCtrl::IsEditable() const
 {
 
 bool wxTextCtrl::IsEditable() const
 {

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

 
 #ifdef __WXGTK20__
     if (m_windowStyle & wxTE_MULTILINE)
 
 #ifdef __WXGTK20__
     if (m_windowStyle & wxTE_MULTILINE)


@@ -1454,24 +1451,24 @@ bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
 // the font will change for subsequent text insertiongs
 bool wxTextCtrl::SetFont( const wxFont &font )
 {
 // the font will change for subsequent text insertiongs
 bool wxTextCtrl::SetFont( const wxFont &font )
 {

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

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

-        return FALSE;
+        return false;

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

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

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

-    return TRUE;
+    return true;

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


@@ -1490,9 +1487,9 @@ void wxTextCtrl::ChangeFontGlobally()
 #endif
 
     wxString value = GetValue();
 #endif
 
     wxString value = GetValue();

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

     {
     {

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

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


@@ -1512,35 +1509,35 @@ 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;

 
 #ifndef __WXGTK20__
     if (!m_widget->window)
 
 #ifndef __WXGTK20__
     if (!m_widget->window)

-        return FALSE;
+        return false;

 #endif
 
     if (!m_backgroundColour.Ok())
 #endif
 
     if (!m_backgroundColour.Ok())

-        return FALSE;
+        return false;

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


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


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

-            return TRUE;
+            return true;

         }
 #ifdef __WXGTK20__
         }
 #ifdef __WXGTK20__

-        GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-        gint l = gtk_text_buffer_get_char_count( text_buffer );
+        gint l = gtk_text_buffer_get_char_count( m_buffer );

 
 

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

                      _T("invalid range in wxTextCtrl::SetStyle") );
 
         GtkTextIter starti, endi;
                      _T("invalid range in wxTextCtrl::SetStyle") );
 
         GtkTextIter starti, endi;

-        gtk_text_buffer_get_iter_at_offset( text_buffer, &starti, start );
-        gtk_text_buffer_get_iter_at_offset( text_buffer, &endi, end );
+        gtk_text_buffer_get_iter_at_offset( m_buffer, &starti, start );
+        gtk_text_buffer_get_iter_at_offset( m_buffer, &endi, end );

 
         // use the attributes from style which are set in it and fall back
         // first to the default style and then to the text control default
         // colours for the others
         wxTextAttr attr = wxTextAttr::Combine(style, m_defaultStyle, this);
 
 
         // use the attributes from style which are set in it and fall back
         // first to the default style and then to the text control default
         // colours for the others
         wxTextAttr attr = wxTextAttr::Combine(style, m_defaultStyle, this);
 

-        wxGtkTextApplyTagsFromAttr( text_buffer, attr, &starti, &endi );
+        wxGtkTextApplyTagsFromAttr( m_buffer, attr, &starti, &endi );

 
 

-         return TRUE;
+        return true;

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

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


@@ -1619,12 +1615,12 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
         gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */
         SetInsertionPoint( old_pos );
 #endif
         gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */
         SetInsertionPoint( old_pos );
 #endif

-        return TRUE;
+        return true;

     }
     else // singe line
     {
         // cannot do this for GTK+'s Entry widget
     }
     else // singe line
     {
         // cannot do this for GTK+'s Entry widget

-        return FALSE;
+        return false;

     }
 }
 
     }
 }
 


@@ -1737,24 +1733,48 @@ wxSize wxTextCtrl::DoGetBestSize() const
 
 void wxTextCtrl::Freeze()
 {
 
 void wxTextCtrl::Freeze()
 {

-#ifndef __WXGTK20__

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

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

     }
     }

+#else
+        gtk_text_freeze(GTK_TEXT(m_text));

 #endif
 #endif

+    }

 }
 
 void wxTextCtrl::Thaw()
 {
 }
 
 void wxTextCtrl::Thaw()
 {

-#ifndef __WXGTK20__

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

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

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

-    }

 #endif
 #endif

+    }

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


@@ -1788,7 +1808,7 @@ 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;


@@ -1799,14 +1819,14 @@ bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff)
     gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed");
 #endif
 
     gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed");
 #endif
 

-    return TRUE;
+    return true;

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

-        return FALSE;
+        return false;

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


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

-        return FALSE;
+        return false;

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