cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixd creation of controls with default initial size

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-10-20 01:15:53 +00:00
parent 86f1458257
commit a63cbfa336
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/msw/control.cpp
View File

@ -98,14 +98,18 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
// by default)
style |= WS_CHILD | WS_VISIBLE;
int x = pos.x == -1 ? 0 : pos.x,
y = pos.y == -1 ? 0 : pos.y,
w = size.x == -1 ? 0 : size.x,
h = size.y == -1 ? 0 : size.y;
m_hWnd = (WXHWND)::CreateWindowEx
(
exstyle, // extended style
classname, // the kind of control to create
label, // the window name
style, // the window style
pos.x, pos.y, // the window position
size.x, size.y, // and size
x, y, w, h, // the window position and size
GetHwndOf(GetParent()), // parent
(HMENU)GetId(), // child id
wxGetInstance(), // app instance
@ -134,6 +138,12 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
// controls use the same font and colours as their parent dialog by default
InheritAttributes();
// set the size now if no initial size specified
if ( w == 0 || h == 0 )
{
SetBestSize(size);
}
return TRUE;
}