Implement NSPanel support to get wxFRAME_TOOL_WINDOW and wxMiniFrame working.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier 2009-02-13 20:15:05 +00:00
parent 7e06ee6d10
commit bb839504eb

View File

@ -87,15 +87,29 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
@end @end
@interface wxNSPanel : wxNSWindow @interface wxNSPanel : NSPanel
{ {
wxNonOwnedWindowCocoaImpl* impl;
} }
- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation;
- (wxNonOwnedWindowCocoaImpl*) implementation;
@end @end
@implementation wxNSPanel @implementation wxNSPanel
- (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation
{
impl = theImplementation;
}
- (wxNonOwnedWindowCocoaImpl*) implementation
{
return impl;
}
@end @end
@ -257,11 +271,7 @@ long style, long extraStyle, const wxString& name )
if ( style & wxFRAME_TOOL_WINDOW ) if ( style & wxFRAME_TOOL_WINDOW )
{ {
if ( ( style & wxSTAY_ON_TOP ) ) windowstyle |= NSTitledWindowMask | NSUtilityWindowMask;
level = kCGUtilityWindowLevel;
else
level = kCGFloatingWindowLevel ;
} }
else if ( ( style & wxPOPUP_WINDOW ) ) else if ( ( style & wxPOPUP_WINDOW ) )
{ {
@ -325,12 +335,11 @@ long style, long extraStyle, const wxString& name )
if ( extraStyle & wxFRAME_EX_METAL) if ( extraStyle & wxFRAME_EX_METAL)
windowstyle |= NSTexturedBackgroundWindowMask; windowstyle |= NSTexturedBackgroundWindowMask;
if ( ( style & wxFRAME_FLOAT_ON_PARENT ) || ( style & wxFRAME_TOOL_WINDOW ) )
level = kCGFloatingWindowLevel;
if ( ( style & wxSTAY_ON_TOP ) ) if ( ( style & wxSTAY_ON_TOP ) )
level = kCGUtilityWindowLevel; level = kCGUtilityWindowLevel;
/*
if ( ( style & wxFRAME_FLOAT_ON_PARENT ) )
group = GetWindowGroupOfClass(kFloatingWindowClass);
*/
NSRect r = wxToNSRect( NULL, wxRect( pos, size) ); NSRect r = wxToNSRect( NULL, wxRect( pos, size) );