Updated OS/2 sources with fixes to wxControl and wxSpinCtrl

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

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index e832dcdf05704efc246545ba426a6e515d07878c..ddd7432d18896c8ada5671d70251eefd6a393e73 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -192,20 +192,21 @@ bool wxTextCtrl::Create( wxWindow *parent,
           m_text = gtk_entry_new();
     }
 
-    wxSize new_size = size,
-           sizeBest = DoGetBestSize();
+    m_parent->DoAddChild( this );
+
+    PostCreation();
+
+    SetFont( parent->GetFont() );
+
+    wxSize size_best( DoGetBestSize() );
+    wxSize new_size( size );
     if (new_size.x == -1)
-        new_size.x = sizeBest.x;
+        new_size.x = size_best.x;
     if (new_size.y == -1)
-        new_size.y = sizeBest.y;
-
+        new_size.y = size_best.y;
     if ((new_size.x != size.x) || (new_size.y != size.y))
         SetSize( new_size.x, new_size.y );
 
-    m_parent->DoAddChild( this );
-
-    PostCreation();
-
     if (multi_line)
         gtk_widget_show(m_text);