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

* Added NSWindowStyleForWxStyle static method

Browse Source 
* Create(): Handle window styles and initial frame size


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-09-08 14:51:38 +00:00
parent f7476b53e6
commit 080c7d56e0
2 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/cocoa/toplevel.h
View File

@@ -73,6 +73,7 @@ protected:
WX_NSWindow m_cocoaNSWindow; WX_NSWindow m_cocoaNSWindow;
static wxCocoaNSWindowHash sm_cocoaHash; static wxCocoaNSWindowHash sm_cocoaHash;
virtual void CocoaReplaceView(WX_NSView oldView, WX_NSView newView); virtual void CocoaReplaceView(WX_NSView oldView, WX_NSView newView);
static unsigned int NSWindowStyleForWxStyle(long style);
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Implementation // Implementation

41
src/cocoa/toplevel.mm
View File

@@ -34,6 +34,7 @@
#import <AppKit/NSView.h> #import <AppKit/NSView.h>
#import <AppKit/NSWindow.h> #import <AppKit/NSWindow.h>
#import <AppKit/NSPanel.h>
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// globals // globals
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -59,6 +60,26 @@ void wxTopLevelWindowCocoa::Init()
m_closed = false; m_closed = false;
} }
unsigned int wxTopLevelWindowCocoa::NSWindowStyleForWxStyle(long style)
{
unsigned int styleMask = 0;
if(style & wxCAPTION)
styleMask |= NSTitledWindowMask;
if(style & wxMINIMIZE_BOX)
styleMask |= NSMiniaturizableWindowMask;
#if 0
if(style & wxMAXIMIZE_BOX)
styleMask |= NSWindowMask;
#endif
if(style & wxCLOSE_BOX)
styleMask |= NSClosableWindowMask;
if(style & wxRESIZE_BORDER)
styleMask |= NSResizableWindowMask;
if(style & wxSIMPLE_BORDER)
styleMask |= NSBorderlessWindowMask;
return styleMask;
}
bool wxTopLevelWindowCocoa::Create(wxWindow *parent, bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
wxWindowID winid, wxWindowID winid,
const wxString& title, const wxString& title,
@@ -76,24 +97,28 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
if ( parent ) if ( parent )
parent->AddChild(this); parent->AddChild(this);
// TODO: get rect from given position/size unsigned int cocoaStyle = NSWindowStyleForWxStyle(style);
NSRect cocoaRect = NSMakeRect(100,100,200,200); if(style & wxFRAME_TOOL_WINDOW)
cocoaStyle |= NSUtilityWindowMask;
// TODO: Set flags given wxWindows style // NOTE: y-origin needs to be flipped.
unsigned int cocoaStyle = 0; NSRect cocoaRect = [NSWindow contentRectForFrameRect:NSMakeRect(pos.x,pos.y,size.x,size.y) styleMask:cocoaStyle];
cocoaStyle |= NSTitledWindowMask;
cocoaStyle |= NSClosableWindowMask;
cocoaStyle |= NSMiniaturizableWindowMask;
cocoaStyle |= NSResizableWindowMask;
m_cocoaNSWindow = NULL; m_cocoaNSWindow = NULL;
m_cocoaNSView = NULL; m_cocoaNSView = NULL;
if(style & wxFRAME_TOOL_WINDOW)
SetNSWindow([[NSPanel alloc] initWithContentRect:cocoaRect styleMask:cocoaStyle backing:NSBackingStoreBuffered defer:NO]);
else
SetNSWindow([[NSWindow alloc] initWithContentRect:cocoaRect styleMask:cocoaStyle backing:NSBackingStoreBuffered defer:NO]); SetNSWindow([[NSWindow alloc] initWithContentRect:cocoaRect styleMask:cocoaStyle backing:NSBackingStoreBuffered defer:NO]);
// NOTE: SetNSWindow has retained the Cocoa object for this object. // NOTE: SetNSWindow has retained the Cocoa object for this object.
// Because we do not release on close, the following release matches the // Because we do not release on close, the following release matches the
// above alloc and thus the retain count will be 1. // above alloc and thus the retain count will be 1.
[m_cocoaNSWindow release]; [m_cocoaNSWindow release];
if(style & wxFRAME_NO_TASKBAR)
[m_cocoaNSWindow setExcludedFromWindowsMenu: YES];
if(style & wxSTAY_ON_TOP)
[m_cocoaNSWindow setLevel:NSFloatingWindowLevel];
[m_cocoaNSWindow setTitle:wxNSStringWithWxString(title)]; [m_cocoaNSWindow setTitle:wxNSStringWithWxString(title)];
return TRUE; return TRUE;
} }