wxSetlocale() doesn't always return NULL

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index fd5d34bc5876ed0708d4778c0556e2c221561cac..3fc3e5386ce14438534d97153cbcf765512dbc2f 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -182,10 +182,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
           m_text = gtk_entry_new();
     }
 
-    wxSize newSize = size;
-    if (newSize.x == -1) newSize.x = 80;
-    if (newSize.y == -1) newSize.y = 26;
-    SetSize( newSize.x, newSize.y );
+    SetSizeOrDefault( size );
 
     m_parent->DoAddChild( this );
 
@@ -966,3 +963,9 @@ void wxTextCtrl::OnInternalIdle()
 
     UpdateWindowUI();
 }
+
+wxSize wxTextCtrl::DoGetBestSize() const
+{
+    // FIXME should be different for multi-line controls...
+    return wxSize(80, 26);
+}