]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk1/textctrl.cpp
Added implementations for two cases of wxSystemSettingsNative::GetMetric to
[wxWidgets.git] / src / gtk1 / textctrl.cpp
index d238a913fae49682d576526945c69e981bcc131f..23b5a380f2d98c7fd23ebe4ffc382d87cb71f336 100644 (file)
@@ -18,6 +18,7 @@
 #include "wx/settings.h"
 #include "wx/panel.h"
 #include "wx/strconv.h"
+#include "wx/fontutil.h"        // for wxNativeFontInfo (GetNativeFontInfo())
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -46,7 +47,48 @@ extern wxWindowGTK *g_delayedFocus;
 // helpers
 // ----------------------------------------------------------------------------
 
-#ifndef __WXGTK20__
+#ifdef __WXGTK20__
+static void wxGtkTextInsert(GtkWidget *text,
+                            GtkTextBuffer *text_buffer,
+                            const wxTextAttr& attr,
+                            wxCharBuffer buffer)
+
+{
+    PangoFontDescription *font_description = attr.HasFont()
+                         ? attr.GetFont().GetNativeFontInfo()->description
+                         : NULL;
+
+    GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor()
+                                           : NULL;
+
+    GdkColor *colBg = attr.HasBackgroundColour()
+                        ? attr.GetBackgroundColour().GetColor()
+                        : NULL;
+
+    GtkTextIter start, end;
+    GtkTextMark *mark;
+    // iterators are invalidated by any mutation that affects 'indexable' buffer contents,
+    // so we save current position in a mark
+    // we need a mark of left gravity, so we cannot use
+    // mark = gtk_text_buffer_get_insert (text_buffer)
+
+    gtk_text_buffer_get_iter_at_mark( text_buffer, &start,
+                                     gtk_text_buffer_get_insert (text_buffer) );
+    mark = gtk_text_buffer_create_mark( text_buffer, NULL, &start, TRUE/*left gravity*/ );
+
+    gtk_text_buffer_insert_at_cursor( text_buffer, buffer, strlen(buffer) );
+
+    gtk_text_buffer_get_iter_at_mark( text_buffer, &end,
+                                     gtk_text_buffer_get_insert (text_buffer) );
+    gtk_text_buffer_get_iter_at_mark( text_buffer, &start, mark );
+
+    GtkTextTag *tag;
+    tag = gtk_text_buffer_create_tag( text_buffer, NULL, "font-desc", font_description,
+                                     "foreground-gdk", colFg,
+                                     "background-gdk", colBg, NULL );
+    gtk_text_buffer_apply_tag( text_buffer, tag, &start, &end );
+}
+#else
 static void wxGtkTextInsert(GtkWidget *text,
                             const wxTextAttr& attr,
                             const char *txt,
@@ -424,10 +466,8 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
     m_cursor = wxCursor( wxCURSOR_IBEAM );
 
-#ifndef __WXGTK20__
     wxTextAttr attrDef( colFg, m_backgroundColour, parent->GetFont() );
     SetDefaultStyle( attrDef );
-#endif
 
     Show( TRUE );
 
@@ -552,9 +592,14 @@ void wxTextCtrl::WriteText( const wxString &text )
         wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
 #endif
         GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-        // TODO: call wahtever is needed to delete the selection
-        gtk_text_buffer_insert_at_cursor( text_buffer, buffer, strlen(buffer) );
+        
+        // TODO: Call whatever is needed to delete the selection.
+        wxGtkTextInsert( m_text, text_buffer, m_defaultStyle, buffer );
 
+        // Scroll to cursor.
+        GtkTextIter iter;
+        gtk_text_buffer_get_iter_at_mark( text_buffer, &iter,  gtk_text_buffer_get_insert( text_buffer ) );
+        gtk_text_view_scroll_to_iter( GTK_TEXT_VIEW(m_text), &iter, 0.0, FALSE, 0.0, 1.0 );
 #else // GTK 1.x
         // After cursor movements, gtk_text_get_point() is wrong by one.
         gtk_text_set_point( GTK_TEXT(m_text), GET_EDITABLE_POS(m_text) );
@@ -949,7 +994,14 @@ void wxTextCtrl::SetSelection( long from, long to )
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifdef __WXGTK20__
-        // ????
+        GtkTextBuffer *buf = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
+
+        GtkTextIter fromi, toi;
+        gtk_text_buffer_get_iter_at_offset( buf, &fromi, from );
+        gtk_text_buffer_get_iter_at_offset( buf, &toi, to );
+
+        gtk_text_buffer_place_cursor( buf, &toi );
+        gtk_text_buffer_move_mark_by_name( buf, "selection_bound", &fromi );
 #else
         gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 #endif
@@ -1033,29 +1085,44 @@ void wxTextCtrl::Remove( long from, long to )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
-#ifndef __WXGTK20__
-    gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+#ifdef __WXGTK20__
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+        GtkTextBuffer *
+            text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
+
+        GtkTextIter fromi, toi;
+        gtk_text_buffer_get_iter_at_offset( text_buffer, &fromi, from );
+        gtk_text_buffer_get_iter_at_offset( text_buffer, &toi, to );
+
+        gtk_text_buffer_delete( text_buffer, &fromi, &toi );
+    }
+    else // single line
 #endif
+    gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 }
 
 void wxTextCtrl::Replace( long from, long to, const wxString &value )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
-#ifndef __WXGTK20__
-    gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
+    Remove( from, to );
 
     if (!value.IsEmpty())
     {
+#ifdef __WXGTK20__
+        SetInsertionPoint( from );
+        WriteText( value );
+#else // GTK 1.x
         gint pos = (gint)from;
 #if wxUSE_UNICODE
         wxWX2MBbuf buf = value.mbc_str();
         gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &pos );
 #else
         gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos );
-#endif
+#endif // wxUSE_UNICODE
+#endif // GTK 1.x/2.x
     }
-#endif
 }
 
 void wxTextCtrl::Cut()
@@ -1120,7 +1187,9 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
 
     gint from, to;
 #ifdef __WXGTK20__
-    if ( !gtk_editable_get_selection_bounds(GTK_EDITABLE(m_text), &from, &to) )
+    GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (m_text));
+    GtkTextIter ifrom, ito;
+    if (!gtk_text_buffer_get_selection_bounds(buffer, &ifrom, &ito))
 #else
     if ( !(GTK_EDITABLE(m_text)->has_selection) )
 #endif
@@ -1130,7 +1199,10 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
     }
     else // got selection
     {
-#ifndef __WXGTK20__
+#ifdef __WXGTK20__
+        from = gtk_text_iter_get_offset(&ifrom);
+        to = gtk_text_iter_get_offset(&ito);
+#else
         from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
         to = (long) GTK_EDITABLE(m_text)->selection_end_pos;
 #endif
@@ -1155,7 +1227,14 @@ bool wxTextCtrl::IsEditable() const
     wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
 
 #ifdef __WXGTK20__
-    return gtk_editable_get_editable(GTK_EDITABLE(m_text));
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+        return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text));
+    }
+    else
+    {
+        return gtk_editable_get_editable(GTK_EDITABLE(m_text));
+    }
 #else
     return GTK_EDITABLE(m_text)->editable;
 #endif
@@ -1326,17 +1405,51 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 
 bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
 {
-    /* VERY dirty way to do that - removes the required text and re-adds it
-       with styling (FIXME) */
     if ( m_windowStyle & wxTE_MULTILINE )
     {
-#ifndef __WXGTK20__
         if ( style.IsDefault() )
         {
             // nothing to do
             return TRUE;
         }
+#ifdef __WXGTK20__
+        GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
+        gint l = gtk_text_buffer_get_char_count( text_buffer );
+
+        wxCHECK_MSG( start >= 0 && end <= l, FALSE,
+                     _T("invalid range in wxTextCtrl::SetStyle") );
+
+        GtkTextIter starti, endi;
+        gtk_text_buffer_get_iter_at_offset( text_buffer, &starti, start );
+        gtk_text_buffer_get_iter_at_offset( text_buffer, &endi, end );
+
+        // use the attributes from style which are set in it and fall back
+        // first to the default style and then to the text control default
+        // colours for the others
+        wxTextAttr attr = wxTextAttr::Combine(style, m_defaultStyle, this);
+
+        PangoFontDescription *font_description = attr.HasFont()
+                             ? attr.GetFont().GetNativeFontInfo()->description
+                             : NULL;
 
+        GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor()
+                                               : NULL;
+
+        GdkColor *colBg = attr.HasBackgroundColour()
+                            ? attr.GetBackgroundColour().GetColor()
+                            : NULL;
+
+        GtkTextTag *tag;
+        tag = gtk_text_buffer_create_tag( text_buffer, NULL, "font-desc", font_description,
+                                         "foreground-gdk", colFg,
+                                         "background-gdk", colBg, NULL );
+        gtk_text_buffer_apply_tag( text_buffer, tag, &starti, &endi );
+
+         return TRUE;
+#else
+        // VERY dirty way to do that - removes the required text and re-adds it
+        // with styling (FIXME)
+         
         gint l = gtk_text_get_length( GTK_TEXT(m_text) );
 
         wxCHECK_MSG( start >= 0 && end <= l, FALSE,
@@ -1478,7 +1591,8 @@ void wxTextCtrl::OnInternalIdle()
         }
     }
 
-    UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 
 wxSize wxTextCtrl::DoGetBestSize() const