Unicode fixes.

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index d300952a7f3c6580d8992de3d25b70e98458139a..4969acb19ff837bd21e6a14c146fe42398d453d4 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -24,6 +24,13 @@
 #include "gtk/gtk.h"
 #include "gdk/gdkkeysyms.h"
 
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -37,6 +44,8 @@ extern bool   g_blockEventsOnDrag;
 static void
 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
+    if (g_isIdle) wxapp_install_idle_handler();
+
     if (!win->m_hasVMT) return;
 
     win->SetModified();
@@ -54,6 +63,8 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 static void
 gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
+    if (g_isIdle) wxapp_install_idle_handler();
+
     if (!win->m_hasVMT) return;
     
     win->CalculateScrollbar();
@@ -184,7 +195,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
 
     if (multi_line)
     {
-        gtk_widget_realize(m_text);
+//        gtk_widget_realize(m_text);
         gtk_widget_show(m_text);
     }
 
@@ -293,7 +304,7 @@ wxString wxTextCtrl::GetValue() const
     }
     else
     {
-        tmp = gtk_entry_get_text( GTK_ENTRY(m_text) );
+        tmp = wxString(gtk_entry_get_text( GTK_ENTRY(m_text) ),*wxConv_current);
     }
     return tmp;
 }