Compilation problem in non-Unicode mode. (Will fix in a more beautiful way later)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index d300952a7f3c6580d8992de3d25b70e98458139a..9142eaa632ddf5532f803bafe676151a799d6a87 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -288,7 +288,11 @@ wxString wxTextCtrl::GetValue() const
     {
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
     {
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );

+#if wxUSE_UNICODE

         tmp = wxString(text,*wxConv_current);
         tmp = wxString(text,*wxConv_current);

+#else
+        tmp = text;
+#endif

         g_free( text );
     }
     else
         g_free( text );
     }
     else

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index d300952a7f3c6580d8992de3d25b70e98458139a..9142eaa632ddf5532f803bafe676151a799d6a87 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -288,7 +288,11 @@ wxString wxTextCtrl::GetValue() const
     {
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
     {
         gint len = gtk_text_get_length( GTK_TEXT(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );

+#if wxUSE_UNICODE

         tmp = wxString(text,*wxConv_current);
         tmp = wxString(text,*wxConv_current);

+#else
+        tmp = text;
+#endif

         g_free( text );
     }
     else
         g_free( text );
     }
     else