X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac0d36b5237d14ec05b4b7f5d88a08bdad82a511..acbd13a365fe2bd7ed6bafd19dc26775a256d499:/src/gtk1/textctrl.cpp

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 884e21b600..4f221beeff 100644
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -182,11 +182,17 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
     gtk_signal_connect( GTK_OBJECT(m_text), "changed",
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 
-    if (!value.IsNull())
+    if (!value.IsEmpty())
     {
         gint tmp = 0;
         gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
-        SetInsertionPointEnd();
+	
+        if (multi_line)
+        {
+	    /* bring editable's cursor uptodate. bug in GTK. */
+	
+	    GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+	}
     }
 
     if (style & wxTE_PASSWORD)
@@ -286,12 +292,33 @@ void wxTextCtrl::WriteText( const wxString &text )
 
     if (m_windowStyle & wxTE_MULTILINE)
     {
-        //gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-        // Find the current insertion point 
+        /* this moves the cursor pos to behind the inserted text */
+	
 	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).
+	
+	/* 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 );
+    }
+}
+
+void wxTextCtrl::AppendText( const wxString &text )
+{
+    wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+        /* we'll insert at the last position */
+        gint len = gtk_text_get_length( GTK_TEXT(m_text) );
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
+	GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
     }
     else
     {
@@ -527,22 +554,35 @@ int wxTextCtrl::GetNumberOfLines() const
 
 void wxTextCtrl::SetInsertionPoint( long pos )
 {
-    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;
+    
+    if (m_windowStyle & wxTE_MULTILINE) 
+    {
+        /* seems to be broken in GTK 1.0.X:
+	   gtk_text_set_point( GTK_TEXT(m_text), (int)pos ); */
+      
+        gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
+          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+      
+        /* we fake a set_point by inserting and deleting. as the user
+	   isn't supposed to get to know about thos non-sense, we
+	   disconnect so that no events are sent to the user program. */
+      
+        gint tmp = (gint)pos;
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), " ", 1, &tmp );
+	gtk_editable_delete_text( GTK_EDITABLE(m_text), tmp-1, tmp );
+	
+        gtk_signal_connect( GTK_OBJECT(m_text), "changed",
+          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+	  
+	/* bring editable's cursor uptodate. another bug in GTK. */
+	
+	GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
     }
     else
+    {
         gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
+    }
 }
 
 void wxTextCtrl::SetInsertionPointEnd()
@@ -698,7 +738,7 @@ int wxTextCtrl::underflow()
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {
-    WriteText(s);
+    AppendText(s);
     return *this;
 }
 
@@ -706,7 +746,7 @@ wxTextCtrl& wxTextCtrl::operator<<(float f)
 {
     static char buf[100];
     sprintf(buf, "%.2f", f);
-    WriteText(buf);
+    AppendText(buf);
     return *this;
 }
 
@@ -714,7 +754,7 @@ wxTextCtrl& wxTextCtrl::operator<<(double d)
 {
     static char buf[100];
     sprintf(buf, "%.2f", d);
-    WriteText(buf);
+    AppendText(buf);
     return *this;
 }
 
@@ -722,7 +762,7 @@ wxTextCtrl& wxTextCtrl::operator<<(int i)
 {
     static char buf[100];
     sprintf(buf, "%i", i);
-    WriteText(buf);
+    AppendText(buf);
     return *this;
 }
 
@@ -730,7 +770,7 @@ wxTextCtrl& wxTextCtrl::operator<<(long i)
 {
     static char buf[100];
     sprintf(buf, "%ld", i);
-    WriteText(buf);
+    AppendText(buf);
     return *this;
 }
 
@@ -740,7 +780,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c)
 
     buf[0] = c;
     buf[1] = 0;
-    WriteText(buf);
+    AppendText(buf);
     return *this;
 }
 #endif