small optimizations: m_isWindow and m_isCommandEvent flags introduced

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index bb72ccea1bf68da5624b00d2bdb24b43f0fec628..d7f0dcd96e01af3d8aa5bd7c3fe60d5bcb35a6fb 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -20,35 +20,44 @@
 #include <sys/stat.h>
 #include <ctype.h>
 
 #include <sys/stat.h>
 #include <ctype.h>
 

+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
+
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
+

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

-static void 
+static void

 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
     win->SetModified();
 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
     win->SetModified();

-    
+

     win->CalculateScrollbar();
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId );
     win->CalculateScrollbar();
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId );

-    wxString val( win->GetValue() );
-    if (!val.IsNull()) event.m_commandString = WXSTRINGCAST val;
+    event.SetString( copystring(win->GetValue()) );

     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );

+    delete[] event.GetString();

 }
 
 //-----------------------------------------------------------------------------
 // "size_allocate"
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "size_allocate"
 //-----------------------------------------------------------------------------
 

-static void 
+static void

 gtk_text_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* WXUNUSED(alloc), wxTextCtrl *win )
 {
     win->CalculateScrollbar();
 }
 
 gtk_text_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* WXUNUSED(alloc), wxTextCtrl *win )
 {
     win->CalculateScrollbar();
 }
 

-

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


@@ -59,13 +68,21 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_CHAR(wxTextCtrl::OnChar)
 END_EVENT_TABLE()
 
     EVT_CHAR(wxTextCtrl::OnChar)
 END_EVENT_TABLE()
 

+#ifndef NO_TEXT_WINDOW_STREAM

 wxTextCtrl::wxTextCtrl() : streambuf()
 {
     if (allocate()) setp(base(),ebuf());
 
     m_modified = FALSE;
 }
 wxTextCtrl::wxTextCtrl() : streambuf()
 {
     if (allocate()) setp(base(),ebuf());
 
     m_modified = FALSE;
 }

+#else
+wxTextCtrl::wxTextCtrl()
+{
+    m_modified = FALSE;
+}
+#endif

 
 

+#ifndef NO_TEXT_WINDOW_STREAM

 wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
       const wxPoint &pos, const wxSize &size,
       int style, const wxValidator& validator, const wxString &name ) : streambuf()
 wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
       const wxPoint &pos, const wxSize &size,
       int style, const wxValidator& validator, const wxString &name ) : streambuf()


@@ -75,17 +92,27 @@ wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
     m_modified = FALSE;
     Create( parent, id, value, pos, size, style, validator, name );
 }
     m_modified = FALSE;
     Create( parent, id, value, pos, size, style, validator, name );
 }

+#else
+wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
+      const wxPoint &pos, const wxSize &size,
+      int style, const wxValidator& validator, const wxString &name )
+{
+    m_modified = FALSE;
+    Create( parent, id, value, pos, size, style, validator, name );
+}
+#endif

 
 bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
       const wxPoint &pos, const wxSize &size,
       int style, const wxValidator& validator, const wxString &name )
 {
     m_needParent = TRUE;
 
 bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
       const wxPoint &pos, const wxSize &size,
       int style, const wxValidator& validator, const wxString &name )
 {
     m_needParent = TRUE;

+    m_acceptsFocus = TRUE;

 
     PreCreation( parent, id, pos, size, style, name );
 
     SetValidator( validator );
 
     PreCreation( parent, id, pos, size, style, name );
 
     SetValidator( validator );

-    
+

     m_vScrollbarVisible = TRUE;
 
     bool multi_line = (style & wxTE_MULTILINE) != 0;
     m_vScrollbarVisible = TRUE;
 
     bool multi_line = (style & wxTE_MULTILINE) != 0;


@@ -94,12 +121,14 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
         // a multi-line edit control: create a vertical scrollbar by default and
         // horizontal if requested
         bool bHasHScrollbar = (style & wxHSCROLL) != 0;
         // a multi-line edit control: create a vertical scrollbar by default and
         // horizontal if requested
         bool bHasHScrollbar = (style & wxHSCROLL) != 0;

- 
+

         // create our control...
         m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
 
         // ... and put into the upper left hand corner of the table
         m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
         // create our control...
         m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
 
         // ... and put into the upper left hand corner of the table
         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,
                       (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
                       (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
         gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1,
                       (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
                       (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),


@@ -109,6 +138,8 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
         if (bHasHScrollbar)
         {
             GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj);
         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_FILL,
             gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2,
                        (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
                        GTK_FILL,


@@ -118,12 +149,14 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
 
         // finally, put the vertical scrollbar in the upper right corner
         m_vScrollbar = gtk_vscrollbar_new( GTK_TEXT(m_text)->vadj );
 
         // 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,
                      GTK_FILL,
                      (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
                      0, 0);
         gtk_widget_show( m_vScrollbar );
         gtk_table_attach(GTK_TABLE(m_widget), m_vScrollbar, 1, 2, 0, 1,
                      GTK_FILL,
                      (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
                      0, 0);
         gtk_widget_show( m_vScrollbar );

-       
+

         gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
           GTK_SIGNAL_FUNC(gtk_text_size_callback), (gpointer)this );
     }
         gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
           GTK_SIGNAL_FUNC(gtk_text_size_callback), (gpointer)this );
     }


@@ -152,15 +185,20 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
     }
 
     // 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_FUNC(gtk_text_changed_callback),
-                     (gpointer)this);
+    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);

 
 

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

     {
         gint tmp = 0;
         gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
     {
         gint tmp = 0;
         gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );

-        SetInsertionPointEnd();
+       
+        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) );
+       }

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


@@ -179,9 +217,9 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
         if (multi_line)
             gtk_text_set_editable( GTK_TEXT(m_text), 1 );
     }
         if (multi_line)
             gtk_text_set_editable( GTK_TEXT(m_text), 1 );
     }

-    
+

     Show( TRUE );
     Show( TRUE );

-    
+

     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
 


@@ -193,23 +231,23 @@ void wxTextCtrl::CalculateScrollbar()
     if ((m_windowStyle & wxTE_MULTILINE) == 0) return;
 
     GtkAdjustment *adj = GTK_TEXT(m_text)->vadj;
     if ((m_windowStyle & wxTE_MULTILINE) == 0) return;
 
     GtkAdjustment *adj = GTK_TEXT(m_text)->vadj;

-    
+

     if (adj->upper - adj->page_size < 0.8)
     {
         if (m_vScrollbarVisible)
         {
     if (adj->upper - adj->page_size < 0.8)
     {
         if (m_vScrollbarVisible)
         {

-           gtk_widget_hide( m_vScrollbar );
-       
-           m_vScrollbarVisible = FALSE;
+        gtk_widget_hide( m_vScrollbar );
+
+        m_vScrollbarVisible = FALSE;

         }
     }
     else
     {
         if (!m_vScrollbarVisible)
         {
         }
     }
     else
     {
         if (!m_vScrollbarVisible)
         {

-           gtk_widget_show( m_vScrollbar );
-           
-           m_vScrollbarVisible = TRUE;
+        gtk_widget_show( m_vScrollbar );
+
+        m_vScrollbarVisible = TRUE;

         }
     }
 }
         }
     }
 }


@@ -260,8 +298,39 @@ void wxTextCtrl::WriteText( const wxString &text )
 
     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;
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
+       
+       /* bring editable's cursor uptodate. bug in GTK. */
+       GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+    }
+    else
+    {
+        /* 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), text, text.Length(), &len );
+       
+       /* bring editable's cursor uptodate. bug in GTK. */
+       GTK_EDITABLE(m_text)->current_pos += text.Len();
+       
+       /* bring entry's cursor uptodate. bug in GTK. */
+       gtk_entry_set_position( GTK_ENTRY(m_text), GTK_EDITABLE(m_text)->current_pos );
+    }
+}
+
+void wxTextCtrl::AppendText( const wxString &text )
+{
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+        /* 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), text, text.Length(), &len );
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );

+       
+       /* bring editable's cursor uptodate. bug in GTK. */
+       GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );

     }
     else
     {
     }
     else
     {


@@ -277,7 +346,7 @@ bool wxTextCtrl::LoadFile( const wxString &file )
 
   Clear();
 
 
   Clear();
 

-  FILE *fp = NULL;
+  FILE *fp = (FILE*) NULL;

   struct stat statb;
 
   if ((stat ((char*) (const char*) file, &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||
   struct stat statb;
 
   if ((stat ((char*) (const char*) file, &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||


@@ -295,15 +364,16 @@ bool wxTextCtrl::LoadFile( const wxString &file )
       return FALSE;
     }
     if (fread (text, sizeof (char), len, fp) != (size_t) len)
       return FALSE;
     }
     if (fread (text, sizeof (char), len, fp) != (size_t) len)

-       {
-       }
+    {
+    }

     fclose (fp);
 
     text[len] = 0;
 
     if (m_windowStyle & wxTE_MULTILINE)
     {
     fclose (fp);
 
     text[len] = 0;
 
     if (m_windowStyle & wxTE_MULTILINE)
     {

-      gtk_editable_insert_text( GTK_EDITABLE(m_text), text, 0, &len );
+      gint pos = 0;
+      gtk_editable_insert_text( GTK_EDITABLE(m_text), text, len, &pos );

     }
     else
     {
     }
     else
     {


@@ -331,7 +401,7 @@ bool wxTextCtrl::SaveFile( const wxString &file )
     }
   else
     {
     }
   else
     {

-      char *text = NULL;
+      char *text = (char*) NULL;

       gint len = 0;
 
       if (m_windowStyle & wxTE_MULTILINE)
       gint len = 0;
 
       if (m_windowStyle & wxTE_MULTILINE)


@@ -345,13 +415,13 @@ bool wxTextCtrl::SaveFile( const wxString &file )
       }
 
       if (fwrite (text, sizeof (char), len, fp) != (size_t) len)
       }
 
       if (fwrite (text, sizeof (char), len, fp) != (size_t) len)

-       {
-         // Did not write whole file
-       }
+      {
+          // Did not write whole file
+      }

 
       // Make sure newline terminates the file
       if (text[len - 1] != '\n')
 
       // Make sure newline terminates the file
       if (text[len - 1] != '\n')

-       fputc ('\n', fp);
+          fputc ('\n', fp);

 
       fclose (fp);
 
 
       fclose (fp);
 


@@ -399,45 +469,61 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
 
 void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
 {
 
 void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
 {

+  /* If you implement this, don't forget to update the documentation!
+   * (file docs/latex/wx/text.tex) */

     wxFAIL_MSG( "wxTextCtrl::OnDropFiles not implemented" );
 }
 
 long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
 {
     wxFAIL_MSG( "wxTextCtrl::OnDropFiles not implemented" );
 }
 
 long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
 {

-  if (!(m_windowStyle & wxTE_MULTILINE))
-    return 0;
-  gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-  char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
-  if(!text)
-    return 0;
-  if( pos >= len)
-    return pos=len-1;
+    if ( m_windowStyle & wxTE_MULTILINE )
+    {
+        wxString text = GetValue();
+
+        // cast to prevent warning. But pos really should've been unsigned.
+        if( (unsigned long)pos > text.Len()  )
+            return FALSE;
+
+        *x=0;   // First Col
+        *y=0;   // First Line

 
 

-  *x=1;   // Col 1
-  *y=1;   // Line 1
-  for (int i = 0; i < pos; i++ )
+        const char* stop = text.c_str() + pos;
+        for ( const char *p = text.c_str(); p < stop; p++ )
+        {
+            if (*p == '\n')
+            {
+                (*y)++;
+                *x=0;
+            }
+            else
+                (*x)++;
+        }
+    }
+    else // single line control

     {
     {

-      if (text[i] == '\n')
-       {
-         (*y)++;
-         *x=1;
-       }
-      else
-       (*x)++;
+        if ( pos <= GTK_ENTRY(m_text)->text_length )
+        {
+            *y = 0;
+            *x = pos;
+        }
+        else
+        {
+            // index out of bounds
+            return FALSE;
+        }

     }
     }

-  g_free( text );
-  return 1;
+
+    return TRUE;

 }
 
 long wxTextCtrl::XYToPosition(long x, long y ) const
 {
     if (!(m_windowStyle & wxTE_MULTILINE)) return 0;
 }
 
 long wxTextCtrl::XYToPosition(long x, long y ) const
 {
     if (!(m_windowStyle & wxTE_MULTILINE)) return 0;

-    
+

     long pos=0;
     long pos=0;

+    for( int i=0; i<y; i++ ) pos += GetLineLength(i) + 1; // one for '\n'

 
 

-    for( int i=1; i<y; i++ ) pos += GetLineLength(i);
-    
-    pos +=x-1; // Pos start with 0
+    pos += x; 

     return pos;
 }
 
     return pos;
 }
 


@@ -458,46 +544,71 @@ int wxTextCtrl::GetNumberOfLines() const
         {
             int currentLine = 0;
             for (int i = 0; i < len; i++ )
         {
             int currentLine = 0;
             for (int i = 0; i < len; i++ )

-           {
+            {

                 if (text[i] == '\n')
                 if (text[i] == '\n')

-                  currentLine++;
-           }
+                    currentLine++;
+            }

             g_free( text );
             g_free( text );

-            return currentLine;
+
+            // currentLine is 0 based, add 1 to get number of lines
+            return currentLine + 1;

         }
         else
         }
         else

-       {
+        {

             return 0;
             return 0;

-       }
+        }

     }
     else
     {
     }
     else
     {

-       return 1;
+        return 1;

     }
 }
 
 void wxTextCtrl::SetInsertionPoint( long pos )
 {
     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
     }
 }
 
 void wxTextCtrl::SetInsertionPoint( long pos )
 {
     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

-
-    int tmp = (int) pos;
-    if (m_windowStyle & wxTE_MULTILINE)
-        gtk_text_set_point( GTK_TEXT(m_text), tmp );
+    
+    if (m_windowStyle & wxTE_MULTILINE) 
+    {
+        /* 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
+          isn't supposed to get to know about thos non-sense, we
+          disconnect so that no events are sent to the user program. */
+      
+        gint tmp = (gint)pos;
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), " ", 1, &tmp );
+       gtk_editable_delete_text( GTK_EDITABLE(m_text), tmp-1, tmp );
+       
+        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) );
+    }

     else
     else

-        gtk_entry_set_position( GTK_ENTRY(m_text), tmp );
+    {
+        gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
+       
+       /* bring editable's cursor uptodate. bug in GTK. */
+       
+       GTK_EDITABLE(m_text)->current_pos = pos;
+    }

 }
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
 
 }
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
     wxCHECK_RET( m_text != NULL, "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) );
+        SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text)));

     else
     else

-      pos = GTK_ENTRY(m_text)->text_length;
-      
-    SetInsertionPoint((pos-1)>0 ? (pos-1):0);
+        gtk_entry_set_position( GTK_ENTRY(m_text), -1 );

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


@@ -538,8 +649,8 @@ long wxTextCtrl::GetLastPosition() const
         pos = gtk_text_get_length( GTK_TEXT(m_text) );
     else
         pos = GTK_ENTRY(m_text)->text_length;
         pos = gtk_text_get_length( GTK_TEXT(m_text) );
     else
         pos = GTK_ENTRY(m_text)->text_length;

-       
-    return (long)pos-1;
+
+    return (long)pos;

 }
 
 void wxTextCtrl::Remove( long from, long to )
 }
 
 void wxTextCtrl::Remove( long from, long to )


@@ -555,7 +666,7 @@ void wxTextCtrl::Replace( long from, long to, const wxString &value )
 
     gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
     if (value.IsNull()) return;
 
     gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
     if (value.IsNull()) return;

-    gint pos = (gint)to;
+    gint pos = (gint)from;

     gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos );
 }
 
     gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos );
 }
 


@@ -600,25 +711,18 @@ void wxTextCtrl::Clear()
 void wxTextCtrl::OnChar( wxKeyEvent &key_event )
 {
     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
 void wxTextCtrl::OnChar( wxKeyEvent &key_event )
 {
     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

-    
+

     if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
     {
         wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
         event.SetEventObject(this);
         if (GetEventHandler()->ProcessEvent(event)) return;
     }
     if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
     {
         wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
         event.SetEventObject(this);
         if (GetEventHandler()->ProcessEvent(event)) return;
     }

-    else if (key_event.KeyCode() == WXK_TAB)
-    {
-        wxNavigationKeyEvent event;
-        event.SetDirection( key_event.m_shiftDown );
-        event.SetWindowChange(FALSE);
-        event.SetEventObject(this);

 
 

-        if (GetEventHandler()->ProcessEvent(event)) return;
-    }

     key_event.Skip();
 }
 
     key_event.Skip();
 }
 

+#ifndef NO_TEXT_WINDOW_STREAM

 int wxTextCtrl::overflow( int WXUNUSED(c) )
 {
     int len = pptr() - pbase();
 int wxTextCtrl::overflow( int WXUNUSED(c) )
 {
     int len = pptr() - pbase();


@@ -650,7 +754,7 @@ int wxTextCtrl::underflow()
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {

-    WriteText(s);
+    AppendText(s);

     return *this;
 }
 
     return *this;
 }
 


@@ -658,7 +762,7 @@ wxTextCtrl& wxTextCtrl::operator<<(float f)
 {
     static char buf[100];
     sprintf(buf, "%.2f", f);
 {
     static char buf[100];
     sprintf(buf, "%.2f", f);

-    WriteText(buf);
+    AppendText(buf);

     return *this;
 }
 
     return *this;
 }
 


@@ -666,7 +770,7 @@ wxTextCtrl& wxTextCtrl::operator<<(double d)
 {
     static char buf[100];
     sprintf(buf, "%.2f", d);
 {
     static char buf[100];
     sprintf(buf, "%.2f", d);

-    WriteText(buf);
+    AppendText(buf);

     return *this;
 }
 
     return *this;
 }
 


@@ -674,7 +778,7 @@ wxTextCtrl& wxTextCtrl::operator<<(int i)
 {
     static char buf[100];
     sprintf(buf, "%i", i);
 {
     static char buf[100];
     sprintf(buf, "%i", i);

-    WriteText(buf);
+    AppendText(buf);

     return *this;
 }
 
     return *this;
 }
 


@@ -682,7 +786,7 @@ wxTextCtrl& wxTextCtrl::operator<<(long i)
 {
     static char buf[100];
     sprintf(buf, "%ld", i);
 {
     static char buf[100];
     sprintf(buf, "%ld", i);

-    WriteText(buf);
+    AppendText(buf);

     return *this;
 }
 
     return *this;
 }
 


@@ -692,9 +796,10 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c)
 
     buf[0] = c;
     buf[1] = 0;
 
     buf[0] = c;
     buf[1] = 0;

-    WriteText(buf);
+    AppendText(buf);

     return *this;
 }
     return *this;
 }

+#endif

 
 GtkWidget* wxTextCtrl::GetConnectWidget()
 {
 
 GtkWidget* wxTextCtrl::GetConnectWidget()
 {


@@ -730,13 +835,13 @@ void wxTextCtrl::SetBackgroundColour( const wxColour &colour )
     wxControl::SetBackgroundColour( colour );
 
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
     wxControl::SetBackgroundColour( colour );
 
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );

-    if (sysbg.Red() == colour.Red() && 
-        sysbg.Green() == colour.Green() && 
+    if (sysbg.Red() == colour.Red() &&
+        sysbg.Green() == colour.Green() &&

         sysbg.Blue() == colour.Blue())
     {
         return;
         sysbg.Blue() == colour.Blue())
     {
         return;

-    } 
-    
+    }
+

     if (!m_backgroundColour.Ok()) return;
 
     if (m_windowStyle & wxTE_MULTILINE)
     if (!m_backgroundColour.Ok()) return;
 
     if (m_windowStyle & wxTE_MULTILINE)


@@ -753,7 +858,7 @@ void wxTextCtrl::ApplyWidgetStyle()
     if (m_windowStyle & wxTE_MULTILINE)
     {
         // how ?
     if (m_windowStyle & wxTE_MULTILINE)
     {
         // how ?

-    } 
+    }

     else
     {
         SetWidgetStyle();
     else
     {
         SetWidgetStyle();