Some Resize/GetBestSize() changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-01-01 23:21:04 +00:00
parent f22e0c3c3f
commit 0279e84482
8 changed files with 62 additions and 30 deletions

View File

@@ -108,8 +108,8 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
newSize.x = bestSize.x;
if (newSize.y == -1)
newSize.y = bestSize.y;
if (newSize.y > 30)
newSize.y = 30;
if (newSize.y > 22)
newSize.y = 22;
if (!PreCreation( parent, pos, newSize ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
@@ -666,7 +666,7 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
wxSize wxComboBox::DoGetBestSize() const
{
// totally bogus - should measure the strings in the combo!
return wxSize(100, 26);
return wxSize(100, 22);
}
#endif