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

OS/2 updates and initial toolbar implementation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-07-01 22:22:13 +00:00
parent 4daa4d665a
commit d697657f1e
14 changed files with 1345 additions and 1122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/os2/window.cpp
View File

@@ -3069,31 +3069,27 @@ bool wxWindowOS2::OS2GetCreateWindowCoords(
) const
{
bool bNonDefault = FALSE;
static const int DEFAULT_Y = 200;
static const int DEFAULT_H = 250;
if (rPos.x == -1)
{
//
// If set x to CW_USEDEFAULT, y parameter is ignored anyhow so we can
// just as well set it to CW_USEDEFAULT as well
rnX = rnY = CW_USEDEFAULT;
}
else
{
rnX = rPos.x;
rnY = rPos.y == -1 ? CW_USEDEFAULT : rPos.y;
rnY = rPos.y == -1 ? DEFAULT_Y : rPos.y;
bNonDefault = TRUE;
}
if (rSize.x == -1)
{
//
// As abobe, h is not used at all in this case anyhow
//
rnWidth = rnHeight = CW_USEDEFAULT;
}
else
{
rnWidth = rSize.x;
rnHeight = rSize.y == -1 ? CW_USEDEFAULT : rSize.y;
rnHeight = rSize.y == -1 ? DEFAULT_H : rSize.y;
bNonDefault = TRUE;
}
return bNonDefault;