Listctrl updates

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

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 12f7e7203c3c441d81ae33122446381d1ad59499..e99ff0e8b7bae9367b7fd06da28c151bb6d562df 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -2,9 +2,8 @@
 // Name:        textctrl.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        textctrl.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Vadim Zeitlin

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -14,71 +13,87 @@
 
 #include "wx/textctrl.h"
 #include "wx/utils.h"
 
 #include "wx/textctrl.h"
 #include "wx/utils.h"

+#include <wx/intl.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <ctype.h>

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-//  wxTextCtrl
+//  "changed"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)
-
-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();

-};
+  
+  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 );
+}
+
+//-----------------------------------------------------------------------------
+//  wxTextCtrl
+//-----------------------------------------------------------------------------

 
 

+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)

 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)

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

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-wxTextCtrl::wxTextCtrl(void) : streambuf()
+wxTextCtrl::wxTextCtrl() : streambuf()

 {
 {

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

 
   m_modified = FALSE;
 
   m_modified = FALSE;

-};
+}

 
 wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
       const wxPoint &pos, const wxSize &size,
 
 wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
       const wxPoint &pos, const wxSize &size,

-      int style, const wxString &name ) : streambuf()
+      int style, const wxValidator& validator, const wxString &name ) : streambuf()

 {
 {

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

 
   m_modified = FALSE;
 
   m_modified = FALSE;

-  Create( parent, id, value, pos, size, style, name );
-};
+  Create( parent, id, value, pos, size, style, validator, name );
+}

 
 bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
       const wxPoint &pos, const wxSize &size,
 
 bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
       const wxPoint &pos, const wxSize &size,

-      int style, const wxString &name )
+      int style, const wxValidator& validator, const wxString &name )

 {
   m_needParent = TRUE;
 
   PreCreation( parent, id, pos, size, style, name );
 
 {
   m_needParent = TRUE;
 
   PreCreation( parent, id, pos, size, style, name );
 

-  bool bMultiLine = (style & wxTE_MULTILINE) != 0;
-  if ( bMultiLine ) {
+  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;
 
     // create our control...
     // 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( NULL, NULL );
+    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);
 
     // ... 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,
-                     GTK_FILL | GTK_EXPAND,
-                     GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-                     0, 0);
+    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);

 
     // put the horizontal scrollbar in the lower left hand corner
 
     // put the horizontal scrollbar in the lower left hand corner

-    if ( bHasHScrollbar ) {
+    if (bHasHScrollbar) 
+    {

       GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj);
       gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2,
       GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj);
       gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2,

-                       GTK_EXPAND | GTK_FILL,
+                       (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),

                        GTK_FILL,
                        0, 0);
       gtk_widget_show(hscrollbar);
                        GTK_FILL,
                        0, 0);
       gtk_widget_show(hscrollbar);


@@ -88,11 +103,12 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
     GtkWidget *vscrollbar = gtk_vscrollbar_new(GTK_TEXT(m_text)->vadj);
     gtk_table_attach(GTK_TABLE(m_widget), vscrollbar, 1, 2, 0, 1,
                      GTK_FILL,
     GtkWidget *vscrollbar = gtk_vscrollbar_new(GTK_TEXT(m_text)->vadj);
     gtk_table_attach(GTK_TABLE(m_widget), vscrollbar, 1, 2, 0, 1,
                      GTK_FILL,

-                     GTK_EXPAND | GTK_FILL | GTK_SHRINK,
+                     (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),

                      0, 0);
                      0, 0);

-    gtk_widget_show(vscrollbar);
+    gtk_widget_show( vscrollbar );

   }
   }

-  else {
+  else 
+  {

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


@@ -103,9 +119,14 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
   if (newSize.y == -1) newSize.y = 26;
   SetSize( newSize.x, newSize.y );
 
   if (newSize.y == -1) newSize.y = 26;
   SetSize( newSize.x, newSize.y );
 

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

   PostCreation();
 
   PostCreation();
 

-  if ( bMultiLine ) {
+  if (multi_line) 
+  {

     gtk_widget_realize(m_text);
     gtk_widget_show(m_text);
   }
     gtk_widget_realize(m_text);
     gtk_widget_show(m_text);
   }


@@ -119,39 +140,57 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
   {
     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 (style & wxREADONLY)
+  if (style & wxTE_PASSWORD)

   {
   {

+    if (!multi_line)
+      gtk_entry_set_visibility( GTK_ENTRY(m_text), FALSE );
+  }
+  
+  if (style & wxTE_READONLY)
+  {    
+    if (!multi_line)
+      gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );

   }
   else
   {
   }
   else
   {

-    if ( bMultiLine )
+    if (multi_line)

       gtk_text_set_editable( GTK_TEXT(m_text), 1 );
       gtk_text_set_editable( GTK_TEXT(m_text), 1 );

-  };
+  }

 
   Show( TRUE );
 
 
   Show( TRUE );
 

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

   return TRUE;
   return TRUE;

-};
+}

 
 

-wxString wxTextCtrl::GetValue(void) const
+wxString wxTextCtrl::GetValue() const

 {
 {

+  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) );
   wxString tmp;
   if (m_windowStyle & wxTE_MULTILINE)
   {
     gint len = gtk_text_get_length( GTK_TEXT(m_text) );

-    tmp = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
+    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) );
   }
   else
   {
     tmp = gtk_entry_get_text( GTK_ENTRY(m_text) );

-  };
+  }

   return tmp;
   return tmp;

-};
+}

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

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

   wxString tmp = "";
   if (!value.IsNull()) tmp = value;
   if (m_windowStyle & wxTE_MULTILINE)
   wxString tmp = "";
   if (!value.IsNull()) tmp = value;
   if (m_windowStyle & wxTE_MULTILINE)


@@ -164,11 +203,13 @@ void wxTextCtrl::SetValue( const wxString &value )
   else
   {
     gtk_entry_set_text( GTK_ENTRY(m_text), tmp );
   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" );
+  

   if (text.IsNull()) return;
 
   if (m_windowStyle & wxTE_MULTILINE)
   if (text.IsNull()) return;
 
   if (m_windowStyle & wxTE_MULTILINE)


@@ -179,134 +220,351 @@ void wxTextCtrl::WriteText( const wxString &text )
   else
   {
     gtk_entry_append_text( GTK_ENTRY(m_text), text );
   else
   {
     gtk_entry_append_text( GTK_ENTRY(m_text), text );

-  };
-};
+  }
+}

 
 

-bool wxTextCtrl::LoadFile( const wxString &WXUNUSED(file) )
+bool wxTextCtrl::LoadFile( const wxString &file )

 {
 {

-  wxFAIL_MSG("wxTextCtrl::LoadFile not implemented");
+  wxCHECK_MSG( m_text != NULL, FALSE, "invalid text ctrl" );
+  
+  if (!wxFileExists(file)) return FALSE;

 
 

+  Clear();
+
+  FILE *fp = NULL;
+  struct stat statb;
+  
+  if ((stat ((char*) (const char*) file, &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||
+      !(fp = fopen ((char*) (const char*) file, "r")))
+  {
+      return FALSE;
+  }
+  else
+  {
+    gint len = statb.st_size;
+    char *text;
+    if (!(text = (char*)malloc ((unsigned) (len + 1))))
+    {
+      fclose (fp);
+      return FALSE;
+    }
+    if (fread (text, sizeof (char), len, fp) != (size_t) len)
+       {
+       }
+    fclose (fp);
+
+    text[len] = 0;
+    
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+      gtk_editable_insert_text( GTK_EDITABLE(m_text), text, 0, &len );
+    }
+    else
+    {
+      gtk_entry_set_text( GTK_ENTRY(m_text), text );
+    }
+    
+    free (text);
+    m_modified = FALSE;
+    return TRUE;
+  }

   return FALSE;
   return FALSE;

-};
+}

 
 

-bool wxTextCtrl::SaveFile( const wxString &WXUNUSED(file) )
+bool wxTextCtrl::SaveFile( const wxString &file )

 {
 {

-  wxFAIL_MSG("wxTextCtrl::SaveFile not implemented");
+  wxCHECK_MSG( m_text != NULL, FALSE, "invalid text ctrl" );
+  
+  if (file == "") return FALSE;
+  
+  FILE *fp;

 
 

-  return FALSE;
-};
+  if (!(fp = fopen ((char*) (const char*) file, "w")))
+    {
+      return FALSE;
+    }
+  else
+    {
+      char *text = NULL;
+      gint len = 0;
+       
+      if (m_windowStyle & wxTE_MULTILINE)
+      {
+        len = gtk_text_get_length( GTK_TEXT(m_text) );
+        text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
+      }
+      else
+      {
+        text = gtk_entry_get_text( GTK_ENTRY(m_text) );
+      }
+      
+      if (fwrite (text, sizeof (char), len, fp) != (size_t) len)
+       {
+         // Did not write whole file
+       }
+       
+      // Make sure newline terminates the file
+      if (text[len - 1] != '\n')
+       fputc ('\n', fp);
+
+      fclose (fp);
+      
+      if (m_windowStyle & wxTE_MULTILINE) g_free( text );
+      
+      m_modified = FALSE;
+      return TRUE;
+    }
+
+  return TRUE;
+}

 
 

-/*

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

-};
-
+  if (m_windowStyle & wxTE_MULTILINE)
+  {
+    gint len = gtk_text_get_length( GTK_TEXT(m_text) );
+    char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
+
+    if (text)
+    {
+        wxString buf("");
+        long i;
+        int currentLine = 0;
+        for (i = 0; currentLine != lineNo && text[i]; i++ )
+          if (text[i] == '\n')
+            currentLine++;
+        // Now get the text
+        int j;
+        for (j = 0; text[i] && text[i] != '\n'; i++, j++ )
+            buf += text[i];
+    
+        g_free( text );
+        return buf;
+    }
+    else
+      return wxEmptyString;
+  }
+  else
+  {
+    if (lineNo == 0) return GetValue();
+    return wxEmptyString;
+  }
+}

 
 

-void wxTextCtrl::OnDropFiles( wxDropFilesEvent &event )
+void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )

 {
 {

-};
+  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;
+  
+  *x=1;   // Col 1
+  *y=1;   // Line 1
+  for (int i = 0; i < pos; i++ )
+    {
+      if (text[i] == '\n')
+       {
+         (*y)++;
+         *x=1;
+       }
+      else
+       (*x)++;
+    } 
+  g_free( text );
+  return 1;
+}

 
 

-long wxTextCtrl::PositionToXY( long pos, long *x, long *y ) const
+long wxTextCtrl::XYToPosition(long x, long y ) const

 {
 {

-};
+  if (!(m_windowStyle & wxTE_MULTILINE))
+    return 0;
+  long pos=0;
+  
+  for(int i=1;i<y;i++)
+      pos +=GetLineLength(i);
+  pos +=x-1; // Pos start with 0
+  return pos;
+}

 
 

-long wxTextCtrl::XYToPosition( long x, long y )
+int wxTextCtrl::GetLineLength(long lineNo) const

 {
 {

-};
+    wxString str = GetLineText (lineNo);
+    return (int) str.Length();
+}

 
 

-int wxTextCtrl::GetNumberOfLines(void)
+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)
+    {
+        int currentLine = 0;
+        for (int i = 0; i < len; i++ )
+          if (text[i] == '\n')
+            currentLine++;
+    
+        g_free( text );
+        return currentLine;
+    }
+    else
+      return 0;
+  }
+  else
+  {
+    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 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 );

-};
+}

 
 

-void wxTextCtrl::SetInsertionPointEnd(void)
+void wxTextCtrl::SetInsertionPointEnd()

 {
 {

+  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;
   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 );
-};
+  SetInsertionPoint((pos-1)>0 ? (pos-1):0);
+}

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

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

   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(void) const
+long wxTextCtrl::GetInsertionPoint() const

 {
 {

+  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(void) const
+long wxTextCtrl::GetLastPosition() const

 {
 {

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

-};
+}

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

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

   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)to;
   gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos );

-};
+}

 
 

-void wxTextCtrl::Cut(void)
+void wxTextCtrl::Cut()

 {
 {

+  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+  
+#if (GTK_MINOR_VERSION == 1)
+  gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );
+#else

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

-};
+#endif
+}

 
 

-void wxTextCtrl::Copy(void)
+void wxTextCtrl::Copy()

 {
 {

+  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+  
+#if (GTK_MINOR_VERSION == 1)
+  gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) );
+#else

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

-};
+#endif
+}

 
 

-void wxTextCtrl::Paste(void)
+void wxTextCtrl::Paste()

 {
 {

+  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+  
+#if (GTK_MINOR_VERSION == 1)
+  gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );
+#else

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

-};
+#endif
+}

 
 

-void wxTextCtrl::Delete(void)
+void wxTextCtrl::Clear()

 {
   SetValue( "" );
 {
   SetValue( "" );

-};
+}

 
 

-void wxTextCtrl::OnChar( wxKeyEvent &WXUNUSED(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);
+
+    if (GetEventHandler()->ProcessEvent(event)) return;
+  }
+  key_event.Skip();
+}

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


@@ -318,9 +576,9 @@ int wxTextCtrl::overflow( int WXUNUSED(c) )
   setp(pbase(), epptr());
   delete[] txt;
   return EOF;
   setp(pbase(), epptr());
   delete[] txt;
   return EOF;

-};
+}

 
 

-int wxTextCtrl::sync(void)
+int wxTextCtrl::sync()

 {
   int len = pptr() - pbase();
   char *txt = new char[len+1];
 {
   int len = pptr() - pbase();
   char *txt = new char[len+1];


@@ -330,12 +588,12 @@ int wxTextCtrl::sync(void)
   setp(pbase(), epptr());
   delete[] txt;
   return 0;
   setp(pbase(), epptr());
   delete[] txt;
   return 0;

-};
+}

 
 

-int wxTextCtrl::underflow(void)
+int wxTextCtrl::underflow()

 {
   return EOF;
 {
   return EOF;

-};
+}

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


@@ -385,3 +643,59 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c)
   return *this;
 }
 
   return *this;
 }
 

+GtkWidget* wxTextCtrl::GetConnectWidget()
+{
+  return GTK_WIDGET(m_text);
+}
+
+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);
+}
+
+void wxTextCtrl::SetFont( const wxFont &WXUNUSED(font) )
+{
+  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+  
+  // doesn't work
+}
+
+void wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) )
+{
+  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+  
+  // doesn't work
+}
+
+void wxTextCtrl::SetBackgroundColour( const wxColour &colour )
+{
+  wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+
+  wxControl::SetBackgroundColour( colour );
+    
+  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()
+{
+  if (m_windowStyle & wxTE_MULTILINE)
+  {
+  }
+  else
+  {
+    SetWidgetStyle();
+    gtk_widget_set_style( m_text, m_widgetStyle );
+  }
+}
+