Oops, forgot to cleanup some commented-out code before last commit.

Setting attributes seems to work okay on both multiline and single
line widgets for both wxGTK and wxGTK2, so don't disable it for
multiline.

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index f37ca3d41ee4adca008aa5d64f7c70178ec0b48d..d36febec6b427f71dd503c3592d7ea0b0613ad17 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -1517,15 +1517,8 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
 
 void wxTextCtrl::ApplyWidgetStyle()
 {
-//     if (m_windowStyle & wxTE_MULTILINE)
-//     {
-//         // how ?
-//     }
-//     else
-    {
-        SetWidgetStyle();
-        gtk_widget_set_style( m_text, m_widgetStyle );
-    }
+    SetWidgetStyle();
+    gtk_widget_set_style( m_text, m_widgetStyle );
 }
 
 void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index f37ca3d41ee4adca008aa5d64f7c70178ec0b48d..d36febec6b427f71dd503c3592d7ea0b0613ad17 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -1517,15 +1517,8 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
 
 void wxTextCtrl::ApplyWidgetStyle()
 {
-//     if (m_windowStyle & wxTE_MULTILINE)
-//     {
-//         // how ?
-//     }
-//     else
-    {
-        SetWidgetStyle();
-        gtk_widget_set_style( m_text, m_widgetStyle );
-    }
+    SetWidgetStyle();
+    gtk_widget_set_style( m_text, m_widgetStyle );
 }
 
 void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))