X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33faea0a0d17e22a771d96573576bf143fd56e54..48fbb5214d7dd35f17d23e6e05631bc8ccc1c8a5:/src/cocoa/toplevel.mm?ds=sidebyside diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm index 39fa6a5b25..9f4518bbfb 100644 --- a/src/cocoa/toplevel.mm +++ b/src/cocoa/toplevel.mm @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2002/11/27 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2002 David Elliott -// License: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -29,10 +29,11 @@ #endif //WX_PRECOMP #include "wx/cocoa/autorelease.h" -#include "wx/cocoa/mbarman.h" +#include "wx/cocoa/string.h" #import #import +#import // ---------------------------------------------------------------------------- // globals // ---------------------------------------------------------------------------- @@ -44,6 +45,8 @@ wxWindowList wxModelessWindows; // wxTopLevelWindowCocoa implementation // ============================================================================ +wxTopLevelWindowCocoa *wxTopLevelWindowCocoa::sm_cocoaDeactivateWindow = NULL; + // ---------------------------------------------------------------------------- // wxTopLevelWindowCocoa creation // ---------------------------------------------------------------------------- @@ -58,6 +61,26 @@ void wxTopLevelWindowCocoa::Init() 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, wxWindowID winid, const wxString& title, @@ -75,42 +98,77 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent, if ( parent ) parent->AddChild(this); - // TODO: get rect from given position/size - NSRect cocoaRect = NSMakeRect(100,100,200,200); - - // TODO: Set flags given wxWindows style - unsigned int cocoaStyle = 0; - cocoaStyle |= NSTitledWindowMask; - cocoaStyle |= NSClosableWindowMask; - cocoaStyle |= NSMiniaturizableWindowMask; - cocoaStyle |= NSResizableWindowMask; + unsigned int cocoaStyle = NSWindowStyleForWxStyle(style); + if(style & wxFRAME_TOOL_WINDOW) + cocoaStyle |= NSUtilityWindowMask; + + wxPoint realpos = pos; + wxSize realsize = size; + // FIXME: this is lame + if(realpos.x==-1) + realpos.x=100; + if(realpos.y==-1) + realpos.y=100; + if(realsize.x==-1) + realsize.x=200; + if(realsize.y==-1) + realsize.y=200; + // NOTE: y-origin needs to be flipped. + NSRect cocoaRect = [NSWindow contentRectForFrameRect:NSMakeRect(realpos.x,realpos.y,realsize.x,realsize.y) styleMask:cocoaStyle]; m_cocoaNSWindow = NULL; m_cocoaNSView = NULL; - SetNSWindow([[NSWindow alloc] initWithContentRect:cocoaRect styleMask:cocoaStyle backing:NSBackingStoreBuffered defer:NO]); + 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]); // NOTE: SetNSWindow has retained the Cocoa object for this object. // Because we do not release on close, the following release matches the // above alloc and thus the retain count will be 1. [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)]; return TRUE; } wxTopLevelWindowCocoa::~wxTopLevelWindowCocoa() { + wxASSERT(sm_cocoaDeactivateWindow!=this); wxAutoNSAutoreleasePool pool; DestroyChildren(); SetNSWindow(NULL); } +bool wxTopLevelWindowCocoa::Destroy() +{ + if(sm_cocoaDeactivateWindow==this) + { + sm_cocoaDeactivateWindow = NULL; + wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(); + } + return wxTopLevelWindowBase::Destroy(); +} + // ---------------------------------------------------------------------------- // wxTopLevelWindowCocoa Cocoa Specifics // ---------------------------------------------------------------------------- +wxMenuBar* wxTopLevelWindowCocoa::GetAppMenuBar(wxCocoaNSWindow *win) +{ + wxTopLevelWindowCocoa *parent = wxDynamicCast(GetParent(),wxTopLevelWindow); + if(parent) + return parent->GetAppMenuBar(win); + return NULL; +} + void wxTopLevelWindowCocoa::SetNSWindow(WX_NSWindow cocoaNSWindow) { bool need_debug = cocoaNSWindow || m_cocoaNSWindow; - if(need_debug) wxLogDebug("wxTopLevelWindowCocoa=%p::SetNSWindow [m_cocoaNSWindow=%p retainCount]=%d",this,m_cocoaNSWindow,[m_cocoaNSWindow retainCount]); + if(need_debug) wxLogTrace(wxTRACE_COCOA_RetainRelease,wxT("wxTopLevelWindowCocoa=%p::SetNSWindow [m_cocoaNSWindow=%p retainCount]=%d"),this,m_cocoaNSWindow,[m_cocoaNSWindow retainCount]); DisassociateNSWindow(m_cocoaNSWindow); [cocoaNSWindow retain]; [m_cocoaNSWindow release]; @@ -120,7 +178,7 @@ void wxTopLevelWindowCocoa::SetNSWindow(WX_NSWindow cocoaNSWindow) else SetNSView(NULL); AssociateNSWindow(m_cocoaNSWindow); - if(need_debug) wxLogDebug("wxTopLevelWindowCocoa=%p::SetNSWindow [cocoaNSWindow=%p retainCount]=%d",this,cocoaNSWindow,[cocoaNSWindow retainCount]); + if(need_debug) wxLogTrace(wxTRACE_COCOA_RetainRelease,wxT("wxTopLevelWindowCocoa=%p::SetNSWindow [cocoaNSWindow=%p retainCount]=%d"),this,cocoaNSWindow,[cocoaNSWindow retainCount]); } void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newView) @@ -129,10 +187,17 @@ void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newVie [m_cocoaNSWindow setContentView:newView]; } +/*static*/ void wxTopLevelWindowCocoa::DeactivatePendingWindow() +{ + if(sm_cocoaDeactivateWindow) + sm_cocoaDeactivateWindow->wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(); + sm_cocoaDeactivateWindow = NULL; +} + void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeKey(void) { - wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeKey",this); - wxMenuBarManager::GetInstance()->WindowDidBecomeKey(this); + DeactivatePendingWindow(); + wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeKey"),this); wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId()); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); @@ -140,33 +205,26 @@ void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeKey(void) void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void) { - wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignKey",this); + wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignKey"),this); wxActivateEvent event(wxEVT_ACTIVATE, FALSE, GetId()); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); - wxMenuBarManager::GetInstance()->WindowDidResignKey(this); } void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeMain(void) { - wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeMain",this); - wxMenuBarManager::GetInstance()->WindowDidBecomeMain(this); + wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeMain"),this); } void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignMain(void) { - wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignMain",this); - wxMenuBarManager::GetInstance()->WindowDidResignMain(this); + wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignMain"),this); } -void wxTopLevelWindowCocoa::Cocoa_close(void) +void wxTopLevelWindowCocoa::CocoaDelegate_windowWillClose(void) { m_closed = true; Destroy(); - /* Be SURE that idle events get ran. If the window was not active when - it was closed, then there will be no more events to trigger this and - therefore it must be done here */ - wxTheApp->CocoaInstallRequestedIdleHandler(); } bool wxTopLevelWindowCocoa::CocoaDelegate_windowShouldClose() @@ -174,6 +232,15 @@ bool wxTopLevelWindowCocoa::CocoaDelegate_windowShouldClose() return wxWindowBase::Close(false); } +void wxTopLevelWindowCocoa::CocoaDelegate_wxMenuItemAction(struct objc_object *sender) +{ +} + +bool wxTopLevelWindowCocoa::CocoaDelegate_validateMenuItem(struct objc_object *sender) +{ + return false; +} + // ---------------------------------------------------------------------------- // wxTopLevelWindowCocoa maximize/minimize // ---------------------------------------------------------------------------- @@ -230,8 +297,8 @@ bool wxTopLevelWindowCocoa::Close(bool force) // will invoke windowShouldClose which will call the base class version // of Close() which will NOT Destroy() the window (see below) but // if closing is not stopped, then performClose will go ahead and - // close the window which will invoke Cocoa_close() setting m_closed - // to true and Destroy()ing the window. + // close the window which will send the close notifications setting + // m_closed to true and Destroy()ing the window. [m_cocoaNSWindow performClose:m_cocoaNSWindow]; return m_closed; } @@ -278,7 +345,7 @@ void wxTopLevelWindowCocoa::CocoaSetWxWindowSize(int width, int height) void wxTopLevelWindowCocoa::DoMoveWindow(int x, int y, int width, int height) { -// wxLogDebug("wxTopLevelWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height); + wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,"wxTopLevelWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height); NSRect cocoaRect = NSMakeRect(x,y,width,height); [m_cocoaNSWindow setFrame: cocoaRect display:NO]; @@ -291,7 +358,7 @@ void wxTopLevelWindowCocoa::DoGetSize(int *w, int *h) const *w=(int)cocoaRect.size.width; if(h) *h=(int)cocoaRect.size.height; -// wxLogDebug("wxTopLevelWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height); + wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,"wxTopLevelWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height); } void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const @@ -301,6 +368,6 @@ void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const *x=(int)cocoaRect.origin.x; if(y) *y=(int)cocoaRect.origin.y; -// wxLogDebug("wxTopLevelWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y); + wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,"wxTopLevelWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y); }