removed Win16 code (patch 905241), last version with remains of Win16 support tagged...

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index d4d643282f4397f33edb127ab42fc72912c85b3b..648fdab6a5533b8ae68ca1a3f9dee7a3afcf9686 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -310,6 +310,8 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
         if (!HasFlag(wxNO_BORDER))
             gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );
+            
+        GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 #else
         // create our control ...
         m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
@@ -443,8 +445,8 @@ bool wxTextCtrl::Create( wxWindow *parent,
     else
 #endif
     {
-    gtk_signal_connect( GTK_OBJECT(m_text), "changed",
-       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+        gtk_signal_connect( GTK_OBJECT(m_text), "changed",
+            GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
     }
 
     // we don't set a valid background colour, because the window
@@ -684,7 +686,7 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
         GtkTextIter end;
         gtk_text_buffer_get_end_iter(text_buffer,&end );
         gchar *text = gtk_text_buffer_get_text(text_buffer,&line,&end,TRUE);
-        wxString result(text);
+        wxString result(wxGTK_CONV_BACK(text));
         g_free(text);
         return result.BeforeFirst(wxT('\n'));
 #endif