X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d59051dd0a4cbb3b51dfcc89025eb19a4671a912..966a3b2cc63ee8ac81fe3095f2e0220504d95f49:/src/gtk/textctrl.cpp

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index f165c20805..4da56a23e5 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -42,10 +42,9 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
     win->CalculateScrollbar();
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId );
-    event.SetString( copystring(win->GetValue()) );
+    event.SetString( win->GetValue() );
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );
-    delete[] event.GetString();
 }
 
 //-----------------------------------------------------------------------------
@@ -127,6 +126,8 @@ 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 );
+	
         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),
@@ -136,6 +137,8 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
         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,
                        (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
                        GTK_FILL,
@@ -145,6 +148,8 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
 
         // 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),
@@ -182,11 +187,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,8 +297,40 @@ void wxTextCtrl::WriteText( const wxString &text )
 
     if (m_windowStyle & wxTE_MULTILINE)
     {
+        /* this moves the cursor pos to behind the inserted text */
+	gint len = GTK_EDITABLE(m_text)->current_pos;
+	
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
+	
+	/* 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 */
+	gint len = GTK_EDITABLE(m_text)->current_pos;
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
+	
+	/* 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 );
+    }
+}
+
+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 );
+	
+	/* bring editable's cursor uptodate. bug in GTK. */
+	GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
     }
     else
     {
@@ -426,6 +469,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 +480,20 @@ long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
     {
         wxString text = GetValue();
 
-        if( pos >= (long)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 +501,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 +521,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 +549,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
         {
@@ -518,11 +567,38 @@ int wxTextCtrl::GetNumberOfLines() const
 void wxTextCtrl::SetInsertionPoint( long pos )
 {
     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
-
-    if (m_windowStyle & wxTE_MULTILINE)
-        gtk_text_set_point( GTK_TEXT(m_text), (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 );
+	
+	/* bring editable's cursor uptodate. bug in GTK. */
+	
+	GTK_EDITABLE(m_text)->current_pos = pos;
+    }
 }
 
 void wxTextCtrl::SetInsertionPointEnd()
@@ -574,7 +650,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 )
@@ -598,7 +674,7 @@ void wxTextCtrl::Cut()
 {
     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
 
-#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MINOR_VERSION > 0)
     gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );
 #else
     gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 );
@@ -609,7 +685,7 @@ void wxTextCtrl::Copy()
 {
     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
 
-#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MINOR_VERSION > 0)
     gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) );
 #else
     gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 );
@@ -620,13 +696,78 @@ void wxTextCtrl::Paste()
 {
     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
 
-#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MINOR_VERSION > 0)
     gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );
 #else
     gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 );
 #endif
 }
 
+bool wxTextCtrl::CanCopy() const
+{
+    // Can copy if there's a selection
+    long from, to;
+    GetSelection(& from, & to);
+    return (from != to) ;
+}
+
+bool wxTextCtrl::CanCut() const
+{
+    // Can cut if there's a selection
+    long from, to;
+    GetSelection(& from, & to);
+    return (from != to) ;
+}
+
+bool wxTextCtrl::CanPaste() const
+{
+    return IsEditable() ;
+}
+
+// Undo/redo
+void wxTextCtrl::Undo()
+{
+    // TODO
+    wxFAIL_MSG( "wxTextCtrl::Undo not implemented" );
+}
+
+void wxTextCtrl::Redo()
+{
+    // TODO
+    wxFAIL_MSG( "wxTextCtrl::Redo not implemented" );
+}
+
+bool wxTextCtrl::CanUndo() const
+{
+    // TODO
+    wxFAIL_MSG( "wxTextCtrl::CanUndo not implemented" );
+    return FALSE;
+}
+
+bool wxTextCtrl::CanRedo() const
+{
+    // TODO
+    wxFAIL_MSG( "wxTextCtrl::CanRedo not implemented" );
+    return FALSE;
+}
+
+// If the return values from and to are the same, there is no
+// selection.
+void wxTextCtrl::GetSelection(long* from, long* to) const
+{
+    // TODO
+    *from = 0;
+    *to = 0;
+    wxFAIL_MSG( "wxTextCtrl::GetSelection not implemented" );
+}
+
+bool wxTextCtrl::IsEditable() const
+{
+    // TODO
+    wxFAIL_MSG( "wxTextCtrl::IsEditable not implemented" );
+    return FALSE;
+}
+
 void wxTextCtrl::Clear()
 {
     SetValue( "" );
@@ -678,7 +819,7 @@ int wxTextCtrl::underflow()
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {
-    WriteText(s);
+    AppendText(s);
     return *this;
 }
 
@@ -686,7 +827,7 @@ wxTextCtrl& wxTextCtrl::operator<<(float f)
 {
     static char buf[100];
     sprintf(buf, "%.2f", f);
-    WriteText(buf);
+    AppendText(buf);
     return *this;
 }
 
@@ -694,7 +835,7 @@ wxTextCtrl& wxTextCtrl::operator<<(double d)
 {
     static char buf[100];
     sprintf(buf, "%.2f", d);
-    WriteText(buf);
+    AppendText(buf);
     return *this;
 }
 
@@ -702,7 +843,7 @@ wxTextCtrl& wxTextCtrl::operator<<(int i)
 {
     static char buf[100];
     sprintf(buf, "%i", i);
-    WriteText(buf);
+    AppendText(buf);
     return *this;
 }
 
@@ -710,7 +851,7 @@ wxTextCtrl& wxTextCtrl::operator<<(long i)
 {
     static char buf[100];
     sprintf(buf, "%ld", i);
-    WriteText(buf);
+    AppendText(buf);
     return *this;
 }
 
@@ -720,7 +861,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c)
 
     buf[0] = c;
     buf[1] = 0;
-    WriteText(buf);
+    AppendText(buf);
     return *this;
 }
 #endif