more wxToolTip changes

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index c2fb43427b72922fd4478ac35e0e069eab59c4dc..884e21b6009a2ad7aef0c1257aef216315fd6c4a 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -13,25 +13,49 @@
 
 #include "wx/textctrl.h"
 #include "wx/utils.h"
 
 #include "wx/textctrl.h"
 #include "wx/utils.h"

-#include <wx/intl.h>
+#include "wx/intl.h"
+#include "wx/settings.h"

 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 
 
 #include <sys/types.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 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
+static void
+gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )

 {
 {

-  win->SetModified();
+    win->SetModified();
+
+    win->CalculateScrollbar();

 
 

-  wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId );
-  wxString val( win->GetValue() );
-  if (!val.IsNull()) event.m_commandString = WXSTRINGCAST val;
-  event.SetEventObject( win );
-  win->GetEventHandler()->ProcessEvent( event );
+    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId );
+    event.SetString( copystring(win->GetValue()) );
+    event.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent( event );
+    delete[] event.GetString();
+}
+
+//-----------------------------------------------------------------------------
+// "size_allocate"
+//-----------------------------------------------------------------------------
+
+static void
+gtk_text_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* WXUNUSED(alloc), wxTextCtrl *win )
+{
+    win->CalculateScrollbar();

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


@@ -41,186 +65,238 @@ static void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)

-  EVT_CHAR(wxTextCtrl::OnChar)
+    EVT_CHAR(wxTextCtrl::OnChar)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

+#ifndef NO_TEXT_WINDOW_STREAM

 wxTextCtrl::wxTextCtrl() : streambuf()
 {
 wxTextCtrl::wxTextCtrl() : streambuf()
 {

-  if (allocate()) setp(base(),ebuf());
+    if (allocate()) setp(base(),ebuf());

 
 

-  m_modified = FALSE;
+    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()
 {

-  if (allocate()) setp(base(),ebuf());
+    if (allocate()) setp(base(),ebuf());

 
 

-  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 )
 {
 
 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_needParent = TRUE;
+    m_acceptsFocus = TRUE;

 
 

-  PreCreation( parent, id, pos, size, style, name );
+    PreCreation( parent, id, pos, size, style, name );

 
 

-  SetValidator( validator );
+    SetValidator( validator );

 
 

-  bool multi_line = (style & wxTE_MULTILINE) != 0;
-  if ( multi_line )
-  {
-    // a multi-line edit control: create a vertical scrollbar by default and
-    // horizontal if requested
-    bool bHasHScrollbar = (style & wxHSCROLL) != 0;
+    m_vScrollbarVisible = TRUE;
+
+    bool multi_line = (style & wxTE_MULTILINE) != 0;
+    if ( multi_line )
+    {
+        // 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 );
+        // 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_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1,
+        // ... and put into the upper left hand corner of the table
+        m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
+        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),
                        0, 0);
 
                       (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
                       (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
                        0, 0);
 

-    // put the horizontal scrollbar in the lower left hand corner
-    if (bHasHScrollbar)
-    {
-      GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj);
-      gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2,
+        // put the horizontal scrollbar in the lower left hand corner
+        if (bHasHScrollbar)
+        {
+            GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj);
+            gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2,

                        (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
                        GTK_FILL,
                        0, 0);
                        (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
                        GTK_FILL,
                        0, 0);

-      gtk_widget_show(hscrollbar);
-    }
+            gtk_widget_show(hscrollbar);
+        }

 
 

-    // finally, put the vertical scrollbar in the upper right corner
-    GtkWidget *vscrollbar = gtk_vscrollbar_new(GTK_TEXT(m_text)->vadj);
-    gtk_table_attach(GTK_TABLE(m_widget), vscrollbar, 1, 2, 0, 1,
+        // finally, put the vertical scrollbar in the upper right corner
+        m_vScrollbar = gtk_vscrollbar_new( GTK_TEXT(m_text)->vadj );
+        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_FILL,
                      (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
                      0, 0);

-    gtk_widget_show( vscrollbar );
-  }
-  else
-  {
-    // a single-line text control: no need for scrollbars
-    m_widget =
-    m_text = gtk_entry_new();
-  }
+        gtk_widget_show( m_vScrollbar );

 
 

-  wxSize newSize = size;
-  if (newSize.x == -1) newSize.x = 80;
-  if (newSize.y == -1) newSize.y = 26;
-  SetSize( newSize.x, newSize.y );
+        gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
+          GTK_SIGNAL_FUNC(gtk_text_size_callback), (gpointer)this );
+    }
+    else
+    {
+        // a single-line text control: no need for scrollbars
+        m_widget =
+          m_text = gtk_entry_new();
+    }

 
 

-  m_parent->AddChild( this );
+    wxSize newSize = size;
+    if (newSize.x == -1) newSize.x = 80;
+    if (newSize.y == -1) newSize.y = 26;
+    SetSize( newSize.x, newSize.y );

 
 

-  (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->AddChild( this );

 
 

-  PostCreation();
+    (m_parent->m_insertCallback)( m_parent, this );

 
 

-  if (multi_line)
-  {
-    gtk_widget_realize(m_text);
-    gtk_widget_show(m_text);
-  }
+    PostCreation();

 
 

-  // we want to be notified about text changes
-  gtk_signal_connect(GTK_OBJECT(m_text), "changed",
-                     GTK_SIGNAL_FUNC(gtk_text_changed_callback),
-                     (gpointer)this);
+    if (multi_line)
+    {
+        gtk_widget_realize(m_text);
+        gtk_widget_show(m_text);
+    }

 
 

-  if (!value.IsNull())
-  {
-    gint tmp = 0;
-    gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
-    SetInsertionPointEnd();
-  }
+    // we want to be notified about text changes
+    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);

 
 

-  if (style & wxTE_PASSWORD)
-  {
-    if (!multi_line)
-      gtk_entry_set_visibility( GTK_ENTRY(m_text), FALSE );
-  }
+    if (!value.IsNull())
+    {
+        gint tmp = 0;
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
+        SetInsertionPointEnd();
+    }

 
 

-  if (style & wxTE_READONLY)
-  {
-    if (!multi_line)
-      gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
-  }
-  else
-  {
-    if (multi_line)
-      gtk_text_set_editable( GTK_TEXT(m_text), 1 );
-  }
+    if (style & wxTE_PASSWORD)
+    {
+        if (!multi_line)
+            gtk_entry_set_visibility( GTK_ENTRY(m_text), FALSE );
+    }

 
 

-  Show( TRUE );
+    if (style & wxTE_READONLY)
+    {
+        if (!multi_line)
+            gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
+    }
+    else
+    {
+        if (multi_line)
+            gtk_text_set_editable( GTK_TEXT(m_text), 1 );
+    }

 
 

-  SetBackgroundColour( parent->GetBackgroundColour() );
-  SetForegroundColour( parent->GetForegroundColour() );
+    Show( TRUE );

 
 

-  return TRUE;
+    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetForegroundColour( parent->GetForegroundColour() );
+
+    return TRUE;
+}
+
+void wxTextCtrl::CalculateScrollbar()
+{
+    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)
+        {
+        gtk_widget_hide( m_vScrollbar );
+
+        m_vScrollbarVisible = FALSE;
+        }
+    }
+    else
+    {
+        if (!m_vScrollbarVisible)
+        {
+        gtk_widget_show( m_vScrollbar );
+
+        m_vScrollbarVisible = TRUE;
+        }
+    }

 }
 
 wxString wxTextCtrl::GetValue() const
 {
 }
 
 wxString wxTextCtrl::GetValue() const
 {

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

 
 

-  wxString tmp;
-  if (m_windowStyle & wxTE_MULTILINE)
-  {
-    gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-    char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
-    tmp = text;
-    g_free( text );
-  }
-  else
-  {
-    tmp = gtk_entry_get_text( GTK_ENTRY(m_text) );
-  }
-  return tmp;
+    wxString tmp;
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+        gint len = gtk_text_get_length( GTK_TEXT(m_text) );
+        char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
+        tmp = text;
+        g_free( text );
+    }
+    else
+    {
+        tmp = gtk_entry_get_text( GTK_ENTRY(m_text) );
+    }
+    return tmp;

 }
 
 void wxTextCtrl::SetValue( const wxString &value )
 {
 }
 
 void wxTextCtrl::SetValue( const wxString &value )
 {

-  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

 
 

-  wxString tmp = "";
-  if (!value.IsNull()) tmp = value;
-  if (m_windowStyle & wxTE_MULTILINE)
-  {
-    gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-    gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len );
-    len = 0;
-    gtk_editable_insert_text( GTK_EDITABLE(m_text), tmp, tmp.Length(), &len );
-  }
-  else
-  {
-    gtk_entry_set_text( GTK_ENTRY(m_text), tmp );
-  }
+    wxString tmp = "";
+    if (!value.IsNull()) tmp = value;
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+        gint len = gtk_text_get_length( GTK_TEXT(m_text) );
+        gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len );
+        len = 0;
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), tmp, tmp.Length(), &len );
+    }
+    else
+    {
+        gtk_entry_set_text( GTK_ENTRY(m_text), tmp );
+    }

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

-  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

 
 

-  if (text.IsNull()) return;
+    if (text.IsNull()) return;

 
 

-  if (m_windowStyle & wxTE_MULTILINE)
-  {
-    gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-    gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
-  }
-  else
-  {
-    gtk_entry_append_text( GTK_ENTRY(m_text), text );
-  }
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+        //gint len = gtk_text_get_length( GTK_TEXT(m_text) );
+        // Find the current insertion point 
+       gint len = GTK_EDITABLE(m_text)->current_pos;
+       // Insert text at this point
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
+       // Note: the insertion point is now at 'len' (past our insertion).
+    }
+    else
+    {
+        gtk_entry_append_text( GTK_ENTRY(m_text), text );
+    }

 }
 
 bool wxTextCtrl::LoadFile( const wxString &file )
 }
 
 bool wxTextCtrl::LoadFile( const wxString &file )


@@ -231,7 +307,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 ||


@@ -249,15 +325,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
     {


@@ -285,7 +362,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)


@@ -299,13 +376,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);
 


@@ -353,46 +430,62 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
 
 void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
 {
 
 void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
 {

-  wxFAIL_MSG( "wxTextCtrl::OnDropFiles not implemented" );
+  /* 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
 {
 }
 
 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;
-
-  *x=1;   // Col 1
-  *y=1;   // Line 1
-  for (int i = 0; i < pos; i++ )
+    if ( m_windowStyle & wxTE_MULTILINE )

     {
     {

-      if (text[i] == '\n')
-       {
-         (*y)++;
-         *x=1;
-       }
-      else
-       (*x)++;
+        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
+
+        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)++;
+        }

     }
     }

-  g_free( text );
-  return 1;
+    else // single line control
+    {
+        if ( pos <= GTK_ENTRY(m_text)->text_length )
+        {
+            *y = 0;
+            *x = pos;
+        }
+        else
+        {
+            // index out of bounds
+            return FALSE;
+        }
+    }
+
+    return TRUE;

 }
 
 long wxTextCtrl::XYToPosition(long x, long y ) const
 {
 }
 
 long wxTextCtrl::XYToPosition(long x, long y ) const
 {

-  if (!(m_windowStyle & wxTE_MULTILINE))
-    return 0;
-  long pos=0;
+    if (!(m_windowStyle & wxTE_MULTILINE)) return 0;

 
 

-  for(int i=1;i<y;i++)
-      pos +=GetLineLength(i);
-  pos +=x-1; // Pos start with 0
-  return pos;
+    long pos=0;
+    for( int i=0; i<y; i++ ) pos += GetLineLength(i) + 1; // one for '\n'
+
+    pos += x; 
+    return pos;

 }
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 }
 
 int wxTextCtrl::GetLineLength(long lineNo) const


@@ -403,299 +496,317 @@ int wxTextCtrl::GetLineLength(long lineNo) const
 
 int wxTextCtrl::GetNumberOfLines() const
 {
 
 int wxTextCtrl::GetNumberOfLines() const
 {

-  if (m_windowStyle & wxTE_MULTILINE)
-  {
-    gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-    char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
-
-    if (text)
+    if (m_windowStyle & wxTE_MULTILINE)

     {
     {

-        int currentLine = 0;
-        for (int i = 0; i < len; i++ )
-          if (text[i] == '\n')
-            currentLine++;
-
-        g_free( text );
-        return currentLine;
+        gint len = gtk_text_get_length( GTK_TEXT(m_text) );
+        char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
+
+        if (text)
+        {
+            int currentLine = 0;
+            for (int i = 0; i < len; i++ )
+            {
+                if (text[i] == '\n')
+                    currentLine++;
+            }
+            g_free( text );
+
+            // currentLine is 0 based, add 1 to get number of lines
+            return currentLine + 1;
+        }
+        else
+        {
+            return 0;
+        }

     }
     else
     }
     else

-      return 0;
-  }
-  else
-  {
-    return 1;
-  }
+    {
+        return 1;
+    }

 }
 
 void wxTextCtrl::SetInsertionPoint( long pos )
 {
 }
 
 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 );
-  else
-    gtk_entry_set_position( GTK_ENTRY(m_text), tmp );
+    int len;
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    if (m_windowStyle & wxTE_MULTILINE) {
+        //gtk_text_set_point( GTK_TEXT(m_text), (int)pos );
+        /* HH: The call commented out above doesn't do anything. Don't know
+        * why. The code below isn't perfect either; it doesn't move the
+        * actual cursor, but subsequent calls to WriteText will insert
+        * text at the set position and move the displayed cursor behind it as 
+        * well. I guess this is good enough for most uses. */
+        len = gtk_text_get_length( GTK_TEXT(m_text) );
+       if ( (pos < 0) || (pos > len) )
+         pos = len;
+       GTK_EDITABLE(m_text)->current_pos = (int)pos;
+    }
+    else
+        gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );

 }
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
 }
 
 void wxTextCtrl::SetInsertionPointEnd()
 {

-  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

 
 

-  int pos = 0;
-  if (m_windowStyle & wxTE_MULTILINE)
-    pos = gtk_text_get_length( GTK_TEXT(m_text) );
-  else
-    pos = GTK_ENTRY(m_text)->text_length;
-  SetInsertionPoint((pos-1)>0 ? (pos-1):0);
+    if (m_windowStyle & wxTE_MULTILINE)
+        SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text)));
+    else
+        gtk_entry_set_position( GTK_ENTRY(m_text), -1 );

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

-  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

 
 

-  if (m_windowStyle & wxTE_MULTILINE)
-    gtk_text_set_editable( GTK_TEXT(m_text), editable );
-  else
-    gtk_entry_set_editable( GTK_ENTRY(m_text), editable );
+    if (m_windowStyle & wxTE_MULTILINE)
+        gtk_text_set_editable( GTK_TEXT(m_text), editable );
+    else
+        gtk_entry_set_editable( GTK_ENTRY(m_text), editable );

 }
 
 void wxTextCtrl::SetSelection( long from, long to )
 {
 }
 
 void wxTextCtrl::SetSelection( long from, long to )
 {

-  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

 
 

-  gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+    gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );

 }
 
 void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
 {
 }
 
 void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
 {

-  wxFAIL_MSG( "wxTextCtrl::ShowPosition not implemented" );
+    wxFAIL_MSG( "wxTextCtrl::ShowPosition not implemented" );

 }
 
 long wxTextCtrl::GetInsertionPoint() const
 {
 }
 
 long wxTextCtrl::GetInsertionPoint() const
 {

-  wxCHECK_MSG( m_text != NULL, 0, "invalid text ctrl" );
+    wxCHECK_MSG( m_text != NULL, 0, "invalid text ctrl" );

 
 

-  return (long) GTK_EDITABLE(m_text)->current_pos;
+    return (long) GTK_EDITABLE(m_text)->current_pos;

 }
 
 long wxTextCtrl::GetLastPosition() const
 {
 }
 
 long wxTextCtrl::GetLastPosition() const
 {

-  wxCHECK_MSG( m_text != NULL, 0, "invalid text ctrl" );
+    wxCHECK_MSG( m_text != NULL, 0, "invalid text ctrl" );

 
 

-  int pos = 0;
-  if (m_windowStyle & wxTE_MULTILINE)
-    pos = gtk_text_get_length( GTK_TEXT(m_text) );
-  else
-    pos = GTK_ENTRY(m_text)->text_length;
-  return (long)pos-1;
+    int pos = 0;
+    if (m_windowStyle & wxTE_MULTILINE)
+        pos = gtk_text_get_length( GTK_TEXT(m_text) );
+    else
+        pos = GTK_ENTRY(m_text)->text_length;
+
+    return (long)pos;

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

-  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

 
 

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

 }
 
 void wxTextCtrl::Replace( long from, long to, const wxString &value )
 {
 }
 
 void wxTextCtrl::Replace( long from, long to, const wxString &value )
 {

-  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

 
 

-  gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
-  if (value.IsNull()) return;
-  gint pos = (gint)to;
-  gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos );
+    gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+    if (value.IsNull()) return;
+    gint pos = (gint)from;
+    gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos );

 }
 
 void wxTextCtrl::Cut()
 {
 }
 
 void wxTextCtrl::Cut()
 {

-  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

 
 #if (GTK_MINOR_VERSION == 1)
 
 #if (GTK_MINOR_VERSION == 1)

-  gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );
+    gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );

 #else
 #else

-  gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 );
+    gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 );

 #endif
 }
 
 void wxTextCtrl::Copy()
 {
 #endif
 }
 
 void wxTextCtrl::Copy()
 {

-  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

 
 #if (GTK_MINOR_VERSION == 1)
 
 #if (GTK_MINOR_VERSION == 1)

-  gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) );
+    gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) );

 #else
 #else

-  gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 );
+    gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 );

 #endif
 }
 
 void wxTextCtrl::Paste()
 {
 #endif
 }
 
 void wxTextCtrl::Paste()
 {

-  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

 
 #if (GTK_MINOR_VERSION == 1)
 
 #if (GTK_MINOR_VERSION == 1)

-  gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );
+    gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );

 #else
 #else

-  gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 );
+    gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 );

 #endif
 }
 
 void wxTextCtrl::Clear()
 {
 #endif
 }
 
 void wxTextCtrl::Clear()
 {

-  SetValue( "" );
+    SetValue( "" );

 }
 
 void wxTextCtrl::OnChar( wxKeyEvent &key_event )
 {
 }
 
 void wxTextCtrl::OnChar( wxKeyEvent &key_event )
 {

-  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);
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

 
 

-    if (GetEventHandler()->ProcessEvent(event)) return;
-  }
-  key_event.Skip();
+    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;
+    }
+
+    key_event.Skip();

 }
 
 }
 

+#ifndef NO_TEXT_WINDOW_STREAM

 int wxTextCtrl::overflow( int WXUNUSED(c) )
 {
 int wxTextCtrl::overflow( int WXUNUSED(c) )
 {

-  int len = pptr() - pbase();
-  char *txt = new char[len+1];
-  strncpy(txt, pbase(), len);
-  txt[len] = '\0';
-  (*this) << txt;
-  setp(pbase(), epptr());
-  delete[] txt;
-  return EOF;
+    int len = pptr() - pbase();
+    char *txt = new char[len+1];
+    strncpy(txt, pbase(), len);
+    txt[len] = '\0';
+    (*this) << txt;
+    setp(pbase(), epptr());
+    delete[] txt;
+    return EOF;

 }
 
 int wxTextCtrl::sync()
 {
 }
 
 int wxTextCtrl::sync()
 {

-  int len = pptr() - pbase();
-  char *txt = new char[len+1];
-  strncpy(txt, pbase(), len);
-  txt[len] = '\0';
-  (*this) << txt;
-  setp(pbase(), epptr());
-  delete[] txt;
-  return 0;
+    int len = pptr() - pbase();
+    char *txt = new char[len+1];
+    strncpy(txt, pbase(), len);
+    txt[len] = '\0';
+    (*this) << txt;
+    setp(pbase(), epptr());
+    delete[] txt;
+    return 0;

 }
 
 int wxTextCtrl::underflow()
 {
 }
 
 int wxTextCtrl::underflow()
 {

-  return EOF;
+    return EOF;

 }
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {
 }
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {

-  WriteText(s);
-  return *this;
+    WriteText(s);
+    return *this;

 }
 
 wxTextCtrl& wxTextCtrl::operator<<(float f)
 {
 }
 
 wxTextCtrl& wxTextCtrl::operator<<(float f)
 {

-  static char buf[100];
-  sprintf(buf, "%.2f", f);
-  WriteText(buf);
-  return *this;
+    static char buf[100];
+    sprintf(buf, "%.2f", f);
+    WriteText(buf);
+    return *this;

 }
 
 wxTextCtrl& wxTextCtrl::operator<<(double d)
 {
 }
 
 wxTextCtrl& wxTextCtrl::operator<<(double d)
 {

-  static char buf[100];
-  sprintf(buf, "%.2f", d);
-  WriteText(buf);
-  return *this;
+    static char buf[100];
+    sprintf(buf, "%.2f", d);
+    WriteText(buf);
+    return *this;

 }
 
 wxTextCtrl& wxTextCtrl::operator<<(int i)
 {
 }
 
 wxTextCtrl& wxTextCtrl::operator<<(int i)
 {

-  static char buf[100];
-  sprintf(buf, "%i", i);
-  WriteText(buf);
-  return *this;
+    static char buf[100];
+    sprintf(buf, "%i", i);
+    WriteText(buf);
+    return *this;

 }
 
 wxTextCtrl& wxTextCtrl::operator<<(long i)
 {
 }
 
 wxTextCtrl& wxTextCtrl::operator<<(long i)
 {

-  static char buf[100];
-  sprintf(buf, "%ld", i);
-  WriteText(buf);
-  return *this;
+    static char buf[100];
+    sprintf(buf, "%ld", i);
+    WriteText(buf);
+    return *this;

 }
 
 wxTextCtrl& wxTextCtrl::operator<<(const char c)
 {
 }
 
 wxTextCtrl& wxTextCtrl::operator<<(const char c)
 {

-  char buf[2];
+    char buf[2];

 
 

-  buf[0] = c;
-  buf[1] = 0;
-  WriteText(buf);
-  return *this;
+    buf[0] = c;
+    buf[1] = 0;
+    WriteText(buf);
+    return *this;

 }
 }

+#endif

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

-  return GTK_WIDGET(m_text);
+    return GTK_WIDGET(m_text);

 }
 
 bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
 {
 }
 
 bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
 {

-  if (m_windowStyle & wxTE_MULTILINE)
-    return (window == GTK_TEXT(m_text)->text_area);
-  else
-    return (window == GTK_ENTRY(m_text)->text_area);
+    if (m_windowStyle & wxTE_MULTILINE)
+        return (window == GTK_TEXT(m_text)->text_area);
+    else
+        return (window == GTK_ENTRY(m_text)->text_area);

 }
 
 void wxTextCtrl::SetFont( const wxFont &WXUNUSED(font) )
 {
 }
 
 void wxTextCtrl::SetFont( const wxFont &WXUNUSED(font) )
 {

-  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

 
 

-  // doesn't work
+    // doesn't work

 }
 
 void wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) )
 {
 }
 
 void wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) )
 {

-  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

 
 

-  // doesn't work
+    // doesn't work

 }
 
 void wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 {
 }
 
 void wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 {

-  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

 
 

-  wxControl::SetBackgroundColour( colour );
+    wxControl::SetBackgroundColour( colour );

 
 

-  if (!m_backgroundColour.Ok()) return;
+    wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
+    if (sysbg.Red() == colour.Red() &&
+        sysbg.Green() == colour.Green() &&
+        sysbg.Blue() == colour.Blue())
+    {
+        return;
+    }

 
 

-  if (m_windowStyle & wxTE_MULTILINE)
-  {
-    GdkWindow *window = GTK_TEXT(m_text)->text_area;
-    m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
-    gdk_window_set_background( window, m_backgroundColour.GetColor() );
-    gdk_window_clear( window );
-  }
+    if (!m_backgroundColour.Ok()) return;
+
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+        GdkWindow *window = GTK_TEXT(m_text)->text_area;
+        m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
+        gdk_window_set_background( window, m_backgroundColour.GetColor() );
+        gdk_window_clear( window );
+    }

 }
 
 void wxTextCtrl::ApplyWidgetStyle()
 {
 }
 
 void wxTextCtrl::ApplyWidgetStyle()
 {

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

 }
 
 }