wxWindow::GetBestSize() added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user