X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e13c1ec4e6e8d2c5852df39c6be5db4fd279227..07b6378fcb2fade6cb360254beeccf2bc81f4a36:/src/gtk/textctrl.cpp

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 112af870c3..3b3cd28c2d 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -11,9 +11,13 @@
 #include "wx/wxprec.h"
 
 #include "wx/textctrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
 #include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/log.h"
 #include "wx/math.h"
 #include "wx/settings.h"
 #include "wx/panel.h"
@@ -600,8 +604,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
         gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );
 
-        if (!HasFlag(wxNO_BORDER))
-            gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );
+        GtkScrolledWindowSetBorder(m_widget, style);
 
         gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK );
 
@@ -744,19 +747,18 @@ wxString wxTextCtrl::GetValue() const
         gtk_text_buffer_get_end_iter( m_buffer, &end );
         gchar *text = gtk_text_buffer_get_text( m_buffer, &start, &end, TRUE );
 
-#if wxUSE_UNICODE
-        wxWCharBuffer buffer( wxConvUTF8.cMB2WX( text ) );
-#else
-        wxCharBuffer buffer( wxConvLocal.cWC2WX( wxConvUTF8.cMB2WC( text ) ) );
-#endif
-        if ( buffer )
-            tmp = buffer;
+        const wxWxCharBuffer buf = wxGTK_CONV_BACK(text);
+        if ( buf )
+            tmp = buf;
 
         g_free( text );
     }
     else
     {
-        tmp = wxGTK_CONV_BACK( gtk_entry_get_text( GTK_ENTRY(m_text) ) );
+        const gchar *text = gtk_entry_get_text( GTK_ENTRY(m_text) );
+        const wxWxCharBuffer buf = wxGTK_CONV_BACK( text );
+        if ( buf )
+            tmp = buf;
     }
 
     return tmp;
@@ -768,25 +770,26 @@ void wxTextCtrl::SetValue( const wxString &value )
 
     if (m_windowStyle & wxTE_MULTILINE)
     {
-#if wxUSE_UNICODE
-        wxCharBuffer buffer( wxConvUTF8.cWX2MB( value) );
-#else
-        wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) );
-#endif
-        if (gtk_text_buffer_get_char_count(m_buffer) != 0)
-            IgnoreNextTextUpdate();
-
+        const wxCharBuffer buffer(wxGTK_CONV(value));
         if ( !buffer )
         {
             // what else can we do? at least don't crash...
             return;
         }
 
+        if (gtk_text_buffer_get_char_count(m_buffer) != 0)
+            IgnoreNextTextUpdate();
+
         gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
     }
-    else
+    else // single line
     {
-        gtk_entry_set_text( GTK_ENTRY(m_text), wxGTK_CONV( value ) );
+        // gtk_entry_set_text() emits two "changed" signals because internally
+        // it calls gtk_editable_delete_text() and gtk_editable_insert_text()
+        // but we want to have only one event
+        IgnoreNextTextUpdate();
+
+        gtk_entry_set_text( GTK_ENTRY(m_text), wxGTK_CONV(value) );
     }
 
     // GRG, Jun/2000: Changed this after a lot of discussion in
@@ -804,6 +807,13 @@ void wxTextCtrl::WriteText( const wxString &text )
     if ( text.empty() )
         return;
 
+    const wxCharBuffer buffer(wxGTK_CONV(text));
+    if ( !buffer )
+    {
+        // what else can we do? at least don't crash...
+        return;
+    }
+
     // gtk_text_changed_callback() will set m_modified to true but m_modified
     // shouldn't be changed by the program writing to the text control itself,
     // so save the old value and restore when we're done
@@ -811,18 +821,14 @@ void wxTextCtrl::WriteText( const wxString &text )
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {
-#if wxUSE_UNICODE
-        wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
-#else
-        wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
-#endif
-        if ( !buffer )
-        {
-            // what else can we do? at least don't crash...
-            return;
-        }
+        // First remove the selection if there is one
+        // TODO:  Is there an easier GTK specific way to do this?
+        long from, to;
+        GetSelection(&from, &to);
+        if (from != to)
+            Remove(from, to);
 
-        // TODO: Call whatever is needed to delete the selection.
+        // Insert the text
         wxGtkTextInsert( m_text, m_buffer, m_defaultStyle, buffer );
 
         GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(m_widget) );
@@ -841,17 +847,6 @@ void wxTextCtrl::WriteText( const wxString &text )
         // This moves the cursor pos to behind the inserted text.
         gint len = gtk_editable_get_position(GTK_EDITABLE(m_text));
 
-#if wxUSE_UNICODE
-        wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
-#else
-        wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
-#endif
-        if ( !buffer )
-        {
-            // what else can we do? at least don't crash...
-            return;
-        }
-
         gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
 
         // Bring entry's cursor uptodate.