AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed default button size, finally

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2000-01-16 13:26:01 +00:00
parent 37b8e67987
commit a63f2bec29
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/msw/button.cpp
View File

@ -95,19 +95,6 @@ bool wxButton::Create(wxWindow *parent,
SetSize(pos.x, pos.y, size.x, size.y);
// bad hack added by Robert to make buttons at least
// 80 pixels wide. There are probably better ways...
// TODO. FIXME.
wxSize nsize( GetSize() );
if ((nsize.x < 80) || (nsize.y < 23))
{
if ((size.x == -1) && (nsize.x < 80))
nsize.x = 80;
if ((size.y == -1) && (nsize.y < 23))
nsize.y = 23;
SetSize( nsize );
}
return TRUE;
}
@ -143,7 +130,11 @@ wxSize wxButton::DoGetBestSize() const
// the button height is proportional to the height of the font used
int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar);
return wxSize(wBtn, hBtn);
wxSize sz = GetDefaultSize();
if (wBtn > sz.x) sz.x = wBtn;
if (hBtn > sz.y) sz.y = hBtn;
return sz;
}
/* static */