fixed warnings after GetFont prototype change

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index be60f4def208c2d916536a3f88f5d1d1f025c695..2d5b6460a5d7a1c651250556fe875bbbecb90585 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__
@@ -1535,10 +1535,9 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
     }
 }
 
-void wxTextCtrl::ApplyWidgetStyle()
+void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    SetWidgetStyle();
-    gtk_widget_set_style( m_text, m_widgetStyle );
+    gtk_widget_modify_style(m_text, style);
 }
 
 void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))