X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/112892b9180e35d20ca68d2383feb04a0aaa4af3..3826db3ef5fc3ac97fb91aa11eb2381b2c96248d:/src/gtk/textctrl.cpp?ds=sidebyside

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index f43f88964d..86eef711a7 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -22,7 +22,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)
 
 void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
-{ 
+{
   win->m_modified = TRUE;
 };
 
@@ -36,45 +36,45 @@ wxTextCtrl::wxTextCtrl(void) : streambuf()
   m_modified = FALSE;
 };
 
-wxTextCtrl::wxTextCtrl( wxWindow *parent, const wxWindowID id, const wxString &value, 
-      const wxPoint &pos, const wxSize &size, 
-      const int style, const wxString &name ) : streambuf()
+wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
+      const wxPoint &pos, const wxSize &size,
+      int style, const wxString &name ) : streambuf()
 {
   m_modified = FALSE;
   Create( parent, id, value, pos, size, style, name );
 };
 
-bool wxTextCtrl::Create( wxWindow *parent, const wxWindowID id, const wxString &value,
-      const wxPoint &pos, const wxSize &size, 
-      const int style, const wxString &name )
+bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
+      const wxPoint &pos, const wxSize &size,
+      int style, const wxString &name )
 {
   m_needParent = TRUE;
-  
+
   PreCreation( parent, id, pos, size, style, name );
-  
+
   if (style & wxTE_MULTILINE)
     m_widget = gtk_text_new( NULL, NULL );
   else
     m_widget = gtk_entry_new();
-    
+
   wxSize newSize = size;
   if (newSize.x == -1) newSize.x = 80;
   if (newSize.y == -1) newSize.y = 26;
   SetSize( newSize.x, newSize.y );
-  
+
   PostCreation();
-  
+
+  // we want to be notified about text changes
+  gtk_signal_connect(GTK_OBJECT(m_widget), "changed",
+                     GTK_SIGNAL_FUNC(gtk_text_changed_callback),
+                     (gpointer)this);
+
   if (!value.IsNull())
   {
     gint tmp = 0;
-    
-    // Don't know why this is so
-    if (style & wxTE_MULTILINE)
-      gtk_editable_insert_text( GTK_EDITABLE(m_widget), value, value.Length()+1, &tmp );
-    else
-      gtk_editable_insert_text( GTK_EDITABLE(m_widget), value, value.Length(), &tmp );
+    gtk_editable_insert_text( GTK_EDITABLE(m_widget), value, value.Length(), &tmp );
   };
-  
+
   if (style & wxREADONLY)
   {
   }
@@ -82,9 +82,9 @@ bool wxTextCtrl::Create( wxWindow *parent, const wxWindowID id, const wxString &
   {
     if (style & wxTE_MULTILINE) gtk_text_set_editable( GTK_TEXT(m_widget), 1 );
   };
-  
+
   Show( TRUE );
-    
+
   return TRUE;
 };
 
@@ -94,7 +94,7 @@ wxString wxTextCtrl::GetValue(void) const
   if (m_windowStyle & wxTE_MULTILINE)
   {
     gint len = gtk_text_get_length( GTK_TEXT(m_widget) );
-    tmp = gtk_editable_get_chars( GTK_EDITABLE(m_widget), 0, len-1 );
+    tmp = gtk_editable_get_chars( GTK_EDITABLE(m_widget), 0, len );
   }
   else
   {
@@ -110,7 +110,7 @@ void wxTextCtrl::SetValue( const wxString &value )
   if (m_windowStyle & wxTE_MULTILINE)
   {
     gint len = gtk_text_get_length( GTK_TEXT(m_widget) );
-    gtk_editable_delete_text( GTK_EDITABLE(m_widget), 0, len-1 );
+    gtk_editable_delete_text( GTK_EDITABLE(m_widget), 0, len );
     len = 0;
     gtk_editable_insert_text( GTK_EDITABLE(m_widget), tmp, tmp.Length(), &len );
   }
@@ -123,10 +123,10 @@ void wxTextCtrl::SetValue( const wxString &value )
 void wxTextCtrl::WriteText( const wxString &text )
 {
   if (text.IsNull()) return;
-  
+
   if (m_windowStyle & wxTE_MULTILINE)
   {
-    gint len = gtk_text_get_length( GTK_TEXT(m_widget) ) - 1;
+    gint len = gtk_text_get_length( GTK_TEXT(m_widget) );
     gtk_editable_insert_text( GTK_EDITABLE(m_widget), text, text.Length(), &len );
   }
   else
@@ -137,11 +137,15 @@ void wxTextCtrl::WriteText( const wxString &text )
 
 bool wxTextCtrl::LoadFile( const wxString &WXUNUSED(file) )
 {
+  wxFAIL_MSG("wxTextCtrl::LoadFile not implemented");
+
   return FALSE;
 };
 
 bool wxTextCtrl::SaveFile( const wxString &WXUNUSED(file) )
 {
+  wxFAIL_MSG("wxTextCtrl::SaveFile not implemented");
+
   return FALSE;
 };
 
@@ -152,10 +156,11 @@ bool wxTextCtrl::IsModified(void)
 
 void wxTextCtrl::DiscardEdits(void)
 {
+  m_modified = FALSE;
 };
 
 /*
-wxString wxTextCtrl::GetLineText( const long lineNo ) const
+wxString wxTextCtrl::GetLineText( long lineNo ) const
 {
 };
 
@@ -164,11 +169,11 @@ void wxTextCtrl::OnDropFiles( wxDropFilesEvent &event )
 {
 };
 
-long wxTextCtrl::PositionToXY( const long pos, long *x, long *y ) const
+long wxTextCtrl::PositionToXY( long pos, long *x, long *y ) const
 {
 };
 
-long wxTextCtrl::XYToPosition( const long x, const long y )
+long wxTextCtrl::XYToPosition( long x, long y )
 {
 };
 
@@ -177,7 +182,7 @@ int wxTextCtrl::GetNumberOfLines(void)
 };
 
 */
-void wxTextCtrl::SetInsertionPoint( const long pos )
+void wxTextCtrl::SetInsertionPoint( long pos )
 {
   int tmp = (int) pos;
   if (m_windowStyle & wxTE_MULTILINE)
@@ -196,7 +201,7 @@ void wxTextCtrl::SetInsertionPointEnd(void)
   SetInsertionPoint( pos-1 );
 };
 
-void wxTextCtrl::SetEditable( const bool editable )
+void wxTextCtrl::SetEditable( bool editable )
 {
   if (m_windowStyle & wxTE_MULTILINE)
     gtk_text_set_editable( GTK_TEXT(m_widget), editable );
@@ -204,13 +209,14 @@ void wxTextCtrl::SetEditable( const bool editable )
     gtk_entry_set_editable( GTK_ENTRY(m_widget), editable );
 };
 
-void wxTextCtrl::SetSelection( const long from, const long to )
+void wxTextCtrl::SetSelection( long from, long to )
 {
   gtk_editable_select_region( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
 };
 
-void wxTextCtrl::ShowPosition( const long WXUNUSED(pos) )
+void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
 {
+  wxFAIL_MSG("wxTextCtrl::ShowPosition not implemented");
 };
 
 long wxTextCtrl::GetInsertionPoint(void) const
@@ -228,12 +234,12 @@ long wxTextCtrl::GetLastPosition(void) const
   return (long)pos-1;
 };
 
-void wxTextCtrl::Remove( const long from, const long to )
+void wxTextCtrl::Remove( long from, long to )
 {
   gtk_editable_delete_text( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
 };
 
-void wxTextCtrl::Replace( const long from, const long to, const wxString &value )
+void wxTextCtrl::Replace( long from, long to, const wxString &value )
 {
   gtk_editable_delete_text( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
   if (value.IsNull()) return;
@@ -273,7 +279,7 @@ int wxTextCtrl::overflow(int c)
     wxError("Streambuf allocation failed","Internal error");
     return EOF;
   }
-  
+
   // Verify that there are no characters in get area
   if ( gptr() && gptr() < egptr() )
   {
@@ -372,7 +378,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
   return *this;
 }
 
-wxTextCtrl& wxTextCtrl::operator<<(const float f)
+wxTextCtrl& wxTextCtrl::operator<<(float f)
 {
   static char buf[100];
   sprintf(buf, "%.2f", f);
@@ -380,7 +386,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const float f)
   return *this;
 }
 
-wxTextCtrl& wxTextCtrl::operator<<(const double d)
+wxTextCtrl& wxTextCtrl::operator<<(double d)
 {
   static char buf[100];
   sprintf(buf, "%.2f", d);
@@ -388,7 +394,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const double d)
   return *this;
 }
 
-wxTextCtrl& wxTextCtrl::operator<<(const int i)
+wxTextCtrl& wxTextCtrl::operator<<(int i)
 {
   static char buf[100];
   sprintf(buf, "%i", i);
@@ -396,7 +402,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const int i)
   return *this;
 }
 
-wxTextCtrl& wxTextCtrl::operator<<(const long i)
+wxTextCtrl& wxTextCtrl::operator<<(long i)
 {
   static char buf[100];
   sprintf(buf, "%ld", i);