more wxToolTip changes

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 29bda2592da25cb13eb1feed043775e1bb8a5022..884e21b6009a2ad7aef0c1257aef216315fd6c4a 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -286,8 +286,12 @@ void wxTextCtrl::WriteText( const wxString &text )
 
     if (m_windowStyle & wxTE_MULTILINE)
     {
-        gint len = gtk_text_get_length( GTK_TEXT(m_text) );
+        //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
     {
@@ -426,6 +430,8 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
 
 void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
 {
+  /* If you implement this, don't forget to update the documentation!
+   * (file docs/latex/wx/text.tex) */
     wxFAIL_MSG( "wxTextCtrl::OnDropFiles not implemented" );
 }
 
@@ -435,17 +441,20 @@ long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
     {
         wxString text = GetValue();
 
-        if( pos >= text.Len()  )
+        // cast to prevent warning. But pos really should've been unsigned.
+        if( (unsigned long)pos > text.Len()  )
             return FALSE;
 
-        *x=1;   // Col 1
-        *y=1;   // Line 1
-        for ( const char *p = text.c_str(); *p; p++ )
+        *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=1;
+                *x=0;
             }
             else
                 (*x)++;
@@ -453,9 +462,9 @@ long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
     }
     else // single line control
     {
-        if ( pos < GTK_ENTRY(m_text)->text_length )
+        if ( pos <= GTK_ENTRY(m_text)->text_length )
         {
-            *y = 1;
+            *y = 0;
             *x = pos;
         }
         else
@@ -473,10 +482,9 @@ long wxTextCtrl::XYToPosition(long x, long y ) const
     if (!(m_windowStyle & wxTE_MULTILINE)) return 0;
 
     long pos=0;
+    for( int i=0; i<y; i++ ) pos += GetLineLength(i) + 1; // one for '\n'
 
-    for( int i=1; i<y; i++ ) pos += GetLineLength(i);
-
-    pos +=x-1; // Pos start with 0
+    pos += x; 
     return pos;
 }
 
@@ -502,7 +510,9 @@ int wxTextCtrl::GetNumberOfLines() const
                     currentLine++;
             }
             g_free( text );
-            return currentLine;
+
+            // currentLine is 0 based, add 1 to get number of lines
+            return currentLine + 1;
         }
         else
         {
@@ -517,20 +527,32 @@ int wxTextCtrl::GetNumberOfLines() const
 
 void wxTextCtrl::SetInsertionPoint( long pos )
 {
+    int len;
     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 );
+    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), tmp );
+        gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
 }
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
 
-    SetInsertionPoint(-1);
+    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 )
@@ -572,7 +594,7 @@ long wxTextCtrl::GetLastPosition() const
     else
         pos = GTK_ENTRY(m_text)->text_length;
 
-    return (long)pos-1;
+    return (long)pos;
 }
 
 void wxTextCtrl::Remove( long from, long to )