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

default pos/size cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2004-10-05 19:17:48 +00:00
parent d5a0636fa0
commit d2518be484
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/cocoa/toplevel.mm
View File

@@ -102,19 +102,30 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
if(style & wxFRAME_TOOL_WINDOW) if(style & wxFRAME_TOOL_WINDOW)
cocoaStyle |= NSUtilityWindowMask; cocoaStyle |= NSUtilityWindowMask;
wxPoint realpos = pos; // Create frame and check and handle default position and size
wxSize realsize = size; int realx,
// FIXME: this is lame realy;
if(realpos.x==-1)
realpos.x=100; // WX has no set default position - the carbon port caps the low
if(realpos.y==-1) // end at 20, 50. Here we do the same, except instead of setting
realpos.y=100; // it to 20 and 50, we set it to 100 and 100 if the values are too low
if(realsize.x==-1) if (pos.x < 20)
realsize.x=200; realx = 100;
if(realsize.y==-1) else
realsize.y=200; realx = pos.x;
if (pos.y < 50)
realy = 100;
else
realy = pos.y;
int realw = WidthDefault(size.x);
int realh = HeightDefault(size.y);
// NOTE: y-origin needs to be flipped. // NOTE: y-origin needs to be flipped.
NSRect cocoaRect = [NSWindow contentRectForFrameRect:NSMakeRect(realpos.x,realpos.y,realsize.x,realsize.y) styleMask:cocoaStyle]; NSRect cocoaRect = [NSWindow
contentRectForFrameRect:NSMakeRect(realx,realy,realw,realh)
styleMask:cocoaStyle];
m_cocoaNSWindow = NULL; m_cocoaNSWindow = NULL;
m_cocoaNSView = NULL; m_cocoaNSView = NULL;