corrected previous commit's wrongly applied patch

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index be60f4def208c2d916536a3f88f5d1d1f025c695..a2ad1509bb50d71cdfef1ff25d1257a8af080494 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -414,6 +414,16 @@ bool wxTextCtrl::Create( wxWindow *parent,
             gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
 #ifdef __WXGTK20__
         else
+            gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
+#else
+    }
+    else
+    {
+        if (multi_line)
+            gtk_text_set_editable( GTK_TEXT(m_text), 1 );
+#endif
+    }
+
 #ifdef __WXGTK20__
     if (multi_line)
     {
@@ -434,16 +444,6 @@ bool wxTextCtrl::Create( wxWindow *parent,
     }
 #endif // gtk+-2.3.5
 #endif // __WXGTK20__
-            gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
-#else
-    }
-    else
-    {
-        if (multi_line)
-            gtk_text_set_editable( GTK_TEXT(m_text), 1 );
-#endif
-    }
-
     
     // We want to be notified about text changes.
 #ifdef __WXGTK20__

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index be60f4def208c2d916536a3f88f5d1d1f025c695..a2ad1509bb50d71cdfef1ff25d1257a8af080494 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -414,6 +414,16 @@ bool wxTextCtrl::Create( wxWindow *parent,
             gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
 #ifdef __WXGTK20__
         else
+            gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
+#else
+    }
+    else
+    {
+        if (multi_line)
+            gtk_text_set_editable( GTK_TEXT(m_text), 1 );
+#endif
+    }
+
 #ifdef __WXGTK20__
     if (multi_line)
     {
@@ -434,16 +444,6 @@ bool wxTextCtrl::Create( wxWindow *parent,
     }
 #endif // gtk+-2.3.5
 #endif // __WXGTK20__
-            gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
-#else
-    }
-    else
-    {
-        if (multi_line)
-            gtk_text_set_editable( GTK_TEXT(m_text), 1 );
-#endif
-    }
-
     
     // We want to be notified about text changes.
 #ifdef __WXGTK20__