fixed frame style

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 4969acb19ff837bd21e6a14c146fe42398d453d4..c83a8aeb71fe1f283be97f5c2955c4ac6f4d6c06 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -44,13 +44,14 @@ extern bool   g_blockEventsOnDrag;
 static void
 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
 static void
 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     if (!win->m_hasVMT) return;
 
     if (!win->m_hasVMT) return;
 

+    if (g_isIdle) 
+        wxapp_install_idle_handler();
+

     win->SetModified();
 
     win->SetModified();
 

-    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId );
+    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );

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


@@ -63,10 +64,11 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 static void
 gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
 static void
 gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     if (!win->m_hasVMT) return;
     
     if (!win->m_hasVMT) return;
     

+    if (g_isIdle) 
+        wxapp_install_idle_handler();
+

     win->CalculateScrollbar();
 }
 
     win->CalculateScrollbar();
 }
 


@@ -135,12 +137,14 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
 
     PreCreation( parent, id, pos, size, style, name );
 
 
     PreCreation( parent, id, pos, size, style, name );
 

+#if wxUSE_VALIDATORS

     SetValidator( validator );
     SetValidator( validator );

+#endif // wxUSE_VALIDATORS

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

-    if ( multi_line )
+    if (multi_line)

     {
         /* a multi-line edit control: create a vertical scrollbar by default and
            horizontal if requested */
     {
         /* a multi-line edit control: create a vertical scrollbar by default and
            horizontal if requested */


@@ -152,28 +156,38 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
         /* ... 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 );
         /* ... 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),
                        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);

-
+                      
+        /* always wrap words */
+        gtk_text_set_word_wrap( GTK_TEXT(m_text), TRUE );
+       

         /* put the horizontal scrollbar in the lower left hand corner */
         if (bHasHScrollbar)
         {
             GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj);
             GTK_WIDGET_UNSET_FLAGS( hscrollbar, GTK_CAN_FOCUS );
         /* put the horizontal scrollbar in the lower left hand corner */
         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,
             gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2,

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

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

-        }
-
-        /* we create the vertical scrollbar on demand */
-       m_vScrollbar = (GtkWidget*) NULL;

 
 

+#if (GTK_MINOR_VERSION > 0)
+            /* don't wrap lines, otherwise we wouldn't need the scrollbar */
+            gtk_text_set_line_wrap( GTK_TEXT(m_text), FALSE );
+#endif
+        }
+       
+        /* 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);

     }
     else
     {
     }
     else
     {


@@ -187,38 +201,46 @@ 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 );
+    m_parent->DoAddChild( this );

 
     PostCreation();
 
     if (multi_line)
 
     PostCreation();
 
     if (multi_line)

-    {
-//        gtk_widget_realize(m_text);

         gtk_widget_show(m_text);
         gtk_widget_show(m_text);

-    }

 
     /* 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);
 
 
     /* 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_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed",
+          (GtkSignalFunc) gtk_scrollbar_changed_callback, (gpointer) this );
+    }
+

     if (!value.IsEmpty())
     {
         gint tmp = 0;
     if (!value.IsEmpty())
     {
         gint tmp = 0;

+
+#if GTK_MINOR_VERSION == 0
+        // if we don't realize it, GTK 1.0.6 dies with a SIGSEGV in
+        // gtk_editable_insert_text()
+        gtk_widget_realize(m_text);
+#endif // GTK 1.0
+

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-       wxWX2MBbuf val = value.mbc_str();
+        wxWX2MBbuf val = value.mbc_str();

         gtk_editable_insert_text( GTK_EDITABLE(m_text), val, strlen(val), &tmp );
         gtk_editable_insert_text( GTK_EDITABLE(m_text), val, strlen(val), &tmp );

-#else
+#else // !Unicode

         gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
         gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );

-#endif
-       
+#endif // Unicode/!Unicode
+

         if (multi_line)
         {
         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) );
-       }
+            /* 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)


@@ -237,18 +259,12 @@ 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 );
     }

-    
-    SetBackgroundColour( parent->GetBackgroundColour() );
+
+    SetBackgroundColour( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) );

     SetForegroundColour( parent->GetForegroundColour() );
 
     Show( TRUE );
 
     SetForegroundColour( parent->GetForegroundColour() );
 
     Show( TRUE );
 

-    if (multi_line)
-    {
-        gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed",
-          (GtkSignalFunc) gtk_scrollbar_changed_callback, (gpointer) this );
-    }
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -263,7 +279,6 @@ 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;
         }
     }


@@ -271,20 +286,7 @@ void wxTextCtrl::CalculateScrollbar()
     {
         if (!m_vScrollbarVisible)
         {
     {
         if (!m_vScrollbarVisible)
         {

-           if (!m_vScrollbar)
-           {
-                /* 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_widget_show( m_vScrollbar );

-

             m_vScrollbarVisible = TRUE;
         }
     }
             m_vScrollbarVisible = TRUE;
         }
     }


@@ -299,12 +301,12 @@ wxString wxTextCtrl::GetValue() const
     {
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
     {
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );

-        tmp = wxString(text,*wxConv_current);
+        tmp = wxString(text,*wxConvCurrent);

         g_free( text );
     }
     else
     {
         g_free( text );
     }
     else
     {

-        tmp = wxString(gtk_entry_get_text( GTK_ENTRY(m_text) ),*wxConv_current);
+        tmp = wxString(gtk_entry_get_text( GTK_ENTRY(m_text) ),*wxConvCurrent);

     }
     return tmp;
 }
     }
     return tmp;
 }


@@ -313,6 +315,9 @@ void wxTextCtrl::SetValue( const wxString &value )
 {
     wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
 {
     wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 

+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+      

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


@@ -321,7 +326,7 @@ void wxTextCtrl::SetValue( const wxString &value )
         gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len );
         len = 0;
 #if wxUSE_UNICODE
         gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len );
         len = 0;
 #if wxUSE_UNICODE

-       wxWX2MBbuf tmpbuf = tmp.mbc_str();
+        wxWX2MBbuf tmpbuf = tmp.mbc_str();

         gtk_editable_insert_text( GTK_EDITABLE(m_text), tmpbuf, strlen(tmpbuf), &len );
 #else
         gtk_editable_insert_text( GTK_EDITABLE(m_text), tmp.mbc_str(), tmp.Length(), &len );
         gtk_editable_insert_text( GTK_EDITABLE(m_text), tmpbuf, strlen(tmpbuf), &len );
 #else
         gtk_editable_insert_text( GTK_EDITABLE(m_text), tmp.mbc_str(), tmp.Length(), &len );


@@ -331,146 +336,169 @@ void wxTextCtrl::SetValue( const wxString &value )
     {
         gtk_entry_set_text( GTK_ENTRY(m_text), tmp.mbc_str() );
     }
     {
         gtk_entry_set_text( GTK_ENTRY(m_text), tmp.mbc_str() );
     }

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

 }
 
 void wxTextCtrl::WriteText( const wxString &text )
 {
     wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
 }
 
 void wxTextCtrl::WriteText( const wxString &text )
 {
     wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 

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

 
 

+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+      

     if (m_windowStyle & wxTE_MULTILINE)
     {
         /* this moves the cursor pos to behind the inserted text */
     if (m_windowStyle & wxTE_MULTILINE)
     {
         /* this moves the cursor pos to behind the inserted text */

-       gint len = GTK_EDITABLE(m_text)->current_pos;
-       
+        gint len = GTK_EDITABLE(m_text)->current_pos;
+

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-       wxWX2MBbuf buf = text.mbc_str();
+        wxWX2MBbuf buf = text.mbc_str();

         gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len );
 #else
         gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
 #endif
         gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len );
 #else
         gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
 #endif

-       
-       /* bring editable's cursor uptodate. bug in GTK. */
-       GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+
+        /* 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 */
     }
     else
     {
         /* this moves the cursor pos to behind the inserted text */

-       gint len = GTK_EDITABLE(m_text)->current_pos;
+        gint len = GTK_EDITABLE(m_text)->current_pos;

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-       wxWX2MBbuf buf = text.mbc_str();
+        wxWX2MBbuf buf = text.mbc_str();

         gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len );
 #else
         gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
 #endif
         gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len );
 #else
         gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
 #endif

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

     }
     }

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

 }
 
 void wxTextCtrl::AppendText( const wxString &text )
 {
     wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
 }
 
 void wxTextCtrl::AppendText( const wxString &text )
 {
     wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 

+    if (text.IsEmpty()) return;
+
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+      

     if (m_windowStyle & wxTE_MULTILINE)
     {
         /* we'll insert at the last position */
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
 #if wxUSE_UNICODE
     if (m_windowStyle & wxTE_MULTILINE)
     {
         /* we'll insert at the last position */
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
 #if wxUSE_UNICODE

-       wxWX2MBbuf buf = text.mbc_str();
+        wxWX2MBbuf buf = text.mbc_str();

         gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len );
 #else
         gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
 #endif
         gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &len );
 #else
         gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
 #endif

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

     }
     else
     {
         gtk_entry_append_text( GTK_ENTRY(m_text), text.mbc_str() );
     }
     }
     else
     {
         gtk_entry_append_text( GTK_ENTRY(m_text), text.mbc_str() );
     }

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

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

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

 
 

-  if (!wxFileExists(file)) return FALSE;
+    if (!wxFileExists(file)) return FALSE;

 
 

-  Clear();
+    Clear();

 
 

-  FILE *fp = (FILE*) NULL;
-  struct stat statb;
+    FILE *fp = (FILE*) NULL;
+    struct stat statb;

 
 

-  if ((stat (FNSTRINGCAST file.fn_str(), &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||
-      !(fp = fopen (FNSTRINGCAST file.fn_str(), "r")))
-  {
-      return FALSE;
-  }
-  else
-  {
-    gint len = statb.st_size;
-    char *text;
-    if (!(text = (char*)malloc ((unsigned) (len + 1))))
+    if ((stat (FNSTRINGCAST file.fn_str(), &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||
+        !(fp = fopen (FNSTRINGCAST file.fn_str(), "r")))

     {
     {

-      fclose (fp);
-      return FALSE;
+        return FALSE;

     }
     }

-    if (fread (text, sizeof (char), len, fp) != (size_t) len)
+    else

     {
     {

-    }
-    fclose (fp);
+        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;
+        text[len] = 0;

 
 

-    if (m_windowStyle & wxTE_MULTILINE)
-    {
-      gint pos = 0;
-      gtk_editable_insert_text( GTK_EDITABLE(m_text), text, len, &pos );
-    }
-    else
-    {
-      gtk_entry_set_text( GTK_ENTRY(m_text), text );
+        gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
+          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+      
+        if (m_windowStyle & wxTE_MULTILINE)
+        {
+            gint pos = 0;
+            gtk_editable_insert_text( GTK_EDITABLE(m_text), text, len, &pos );
+        }
+        else
+        {
+            gtk_entry_set_text( GTK_ENTRY(m_text), text );
+        }
+    
+        gtk_signal_connect( GTK_OBJECT(m_text), "changed",
+          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+      
+        free (text);
+        m_modified = FALSE;
+        return TRUE;

     }
     }

-
-    free (text);
-    m_modified = FALSE;
-    return TRUE;
-  }
-  return FALSE;
+    return FALSE;

 }
 
 bool wxTextCtrl::SaveFile( const wxString &file )
 {
 }
 
 bool wxTextCtrl::SaveFile( const wxString &file )
 {

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

 
 

-  if (file == _T("")) return FALSE;
+    if (file == _T("")) return FALSE;

 
 

-  FILE *fp;
+    FILE *fp;

 
 

-  if (!(fp = fopen (FNSTRINGCAST file.fn_str(), "w")))
+    if (!(fp = fopen (FNSTRINGCAST file.fn_str(), "w")))

     {
     {

-      return FALSE;
+        return FALSE;

     }
     }

-  else
+    else

     {
       char *text = (char*) NULL;
       gint len = 0;
 
       if (m_windowStyle & wxTE_MULTILINE)
       {
     {
       char *text = (char*) 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 );
+          len = gtk_text_get_length( GTK_TEXT(m_text) );
+          text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );

       }
       else
       {
       }
       else
       {

-        text = gtk_entry_get_text( GTK_ENTRY(m_text) );
+          text = gtk_entry_get_text( GTK_ENTRY(m_text) );

       }
 
       if (fwrite (text, sizeof (char), len, fp) != (size_t) len)
       }
 
       if (fwrite (text, sizeof (char), len, fp) != (size_t) len)


@@ -490,7 +518,7 @@ bool wxTextCtrl::SaveFile( const wxString &file )
       return TRUE;
     }
 
       return TRUE;
     }
 

-  return TRUE;
+    return TRUE;

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


@@ -582,7 +610,7 @@ long wxTextCtrl::XYToPosition(long x, long y ) const
     long pos=0;
     for( int i=0; i<y; i++ ) pos += GetLineLength(i) + 1; // one for '\n'
 
     long pos=0;
     for( int i=0; i<y; i++ ) pos += GetLineLength(i) + 1; // one for '\n'
 

-    pos += x; 
+    pos += x;

     return pos;
 }
 
     return pos;
 }
 


@@ -626,37 +654,37 @@ int wxTextCtrl::GetNumberOfLines() const
 void wxTextCtrl::SetInsertionPoint( long pos )
 {
     wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 void wxTextCtrl::SetInsertionPoint( long pos )
 {
     wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );

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

     {
         /* seems to be broken in GTK 1.0.X:
     {
         /* seems to be broken in GTK 1.0.X:

-          gtk_text_set_point( GTK_TEXT(m_text), (int)pos ); */
-      
+           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);
         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
         /* 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. */
-      
+           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 );
         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_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);
         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) );
+
+        /* bring editable's cursor uptodate. another bug in GTK. */
+
+        GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );

     }
     else
     {
         gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
     }
     else
     {
         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;
+
+        /* bring editable's cursor uptodate. bug in GTK. */
+
+        GTK_EDITABLE(m_text)->current_pos = pos;

     }
 }
 
     }
 }
 


@@ -689,7 +717,7 @@ void wxTextCtrl::SetSelection( long from, long to )
 
 void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
 {
 
 void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
 {

-    wxFAIL_MSG( _T("wxTextCtrl::ShowPosition not implemented") );
+//    SetInsertionPoint( pos );

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


@@ -716,33 +744,54 @@ void wxTextCtrl::Remove( long from, long to )
 {
     wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
 {
     wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 

+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+      

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

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

 }
 
 void wxTextCtrl::Replace( long from, long to, const wxString &value )
 {
     wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
 }
 
 void wxTextCtrl::Replace( long from, long to, const wxString &value )
 {
     wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 

+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+      

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

-    if (value.IsNull()) return;
-    gint pos = (gint)from;
+    
+    if (!value.IsEmpty())
+    {
+        gint pos = (gint)from;

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    wxWX2MBbuf buf = value.mbc_str();
-    gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &pos );
+        wxWX2MBbuf buf = value.mbc_str();
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &pos );

 #else
 #else

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

 #endif
 #endif

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

 }
 
 void wxTextCtrl::Cut()
 {
     wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
 }
 
 void wxTextCtrl::Cut()
 {
     wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 

+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+      

 #if (GTK_MINOR_VERSION > 0)
     gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );
 #else
     gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 );
 #endif
 #if (GTK_MINOR_VERSION > 0)
     gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );
 #else
     gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 );
 #endif

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

 }
 
 void wxTextCtrl::Copy()
 }
 
 void wxTextCtrl::Copy()


@@ -760,11 +809,17 @@ void wxTextCtrl::Paste()
 {
     wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 
 {
     wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
 

+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+      

 #if (GTK_MINOR_VERSION > 0)
     gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );
 #else
     gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 );
 #endif
 #if (GTK_MINOR_VERSION > 0)
     gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );
 #else
     gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 );
 #endif

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

 }
 
 bool wxTextCtrl::CanCopy() const
 }
 
 bool wxTextCtrl::CanCopy() const


@@ -819,17 +874,24 @@ bool wxTextCtrl::CanRedo() const
 // selection.
 void wxTextCtrl::GetSelection(long* from, long* to) const
 {
 // selection.
 void wxTextCtrl::GetSelection(long* from, long* to) const
 {

-    // TODO
-    *from = 0;
-    *to = 0;
-    wxFAIL_MSG( _T("wxTextCtrl::GetSelection not implemented") );
+    wxCHECK_RET( m_text != NULL, _T("invalid text ctrl") );
+    
+    if (!(GTK_EDITABLE(m_text)->has_selection))
+    {
+        if (from) *from = 0;
+       if (to)   *to = 0;
+       return;
+    }
+    
+    if (from) *from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
+    if (to)   *to = (long) GTK_EDITABLE(m_text)->selection_end_pos;

 }
 
 bool wxTextCtrl::IsEditable() const
 {
 }
 
 bool wxTextCtrl::IsEditable() const
 {

-    // TODO
-    wxFAIL_MSG( _T("wxTextCtrl::IsEditable not implemented") );
-    return FALSE;
+    wxCHECK_MSG( m_text != NULL, FALSE, _T("invalid text ctrl") );
+
+    return GTK_EDITABLE(m_text)->editable;

 }
 
 void wxTextCtrl::Clear()
 }
 
 void wxTextCtrl::Clear()


@@ -943,43 +1005,53 @@ bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
         return (window == GTK_ENTRY(m_text)->text_area);
 }
 
         return (window == GTK_ENTRY(m_text)->text_area);
 }
 

-void wxTextCtrl::SetFont( const wxFont &WXUNUSED(font) )
+bool wxTextCtrl::SetFont( const wxFont &WXUNUSED(font) )

 {
 {

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

 
     // doesn't work
 
     // doesn't work

+    return FALSE;

 }
 
 }
 

-void wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) )
+bool wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) )

 {
 {

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

 
     // doesn't work
 
     // doesn't work

+    return FALSE;

 }
 
 }
 

-void wxTextCtrl::SetBackgroundColour( const wxColour &colour )
+bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )

 {
 {

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

 
     wxControl::SetBackgroundColour( colour );
 
 
     wxControl::SetBackgroundColour( colour );
 

+    if (!m_widget->window)
+        return FALSE;
+

     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
     if (sysbg.Red() == colour.Red() &&
         sysbg.Green() == colour.Green() &&
         sysbg.Blue() == colour.Blue())
     {
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
     if (sysbg.Red() == colour.Red() &&
         sysbg.Green() == colour.Green() &&
         sysbg.Blue() == colour.Blue())
     {

-        return;
+        return FALSE; // FIXME or TRUE?

     }
 
     }
 

-    if (!m_backgroundColour.Ok()) return;
+    if (!m_backgroundColour.Ok())
+        return FALSE;

 
     if (m_windowStyle & wxTE_MULTILINE)
     {
         GdkWindow *window = GTK_TEXT(m_text)->text_area;
 
     if (m_windowStyle & wxTE_MULTILINE)
     {
         GdkWindow *window = GTK_TEXT(m_text)->text_area;

+        if (!window)
+            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 );
     }

+
+    return TRUE;

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