Big wxDataViewCtrl renderer classes refactoring.

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 8af511ffc7cbf04e1b908d613f9986fcd83baec7..6a8d22424a41b5dac8af4015337c82f6774befbf 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -351,7 +351,7 @@ extern "C" {
 static void
 au_check_word( GtkTextIter *s, GtkTextIter *e )
 {
 static void
 au_check_word( GtkTextIter *s, GtkTextIter *e )
 {

-    static const char *URIPrefixes[] =
+    static const char *const URIPrefixes[] =

     {
         "http://",
         "ftp://",
     {
         "http://",
         "ftp://",


@@ -704,6 +704,9 @@ bool wxTextCtrl::Create( wxWindow *parent,
         // a single-line text control: no need for scrollbars
         m_widget =
         m_text = gtk_entry_new();
         // a single-line text control: no need for scrollbars
         m_widget =
         m_text = gtk_entry_new();

+        // work around probable bug in GTK+ 2.18 when calling WriteText on a
+        // new, empty control, see http://trac.wxwidgets.org/ticket/11409
+        gtk_entry_get_text((GtkEntry*)m_text);

 
         if (style & wxNO_BORDER)
             g_object_set (m_text, "has-frame", FALSE, NULL);
 
         if (style & wxNO_BORDER)
             g_object_set (m_text, "has-frame", FALSE, NULL);