X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/911e17c6cf31c0e9e7ab4cdb8e03d66203ebbab8..d4b73b1b8e585418459362c9bf9173aa21da8c41:/src/cocoa/toplevel.mm?ds=inline

diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index 7535026a54..a7c3f22380 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,9 +29,11 @@
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"
+#include "wx/cocoa/string.h"
 
 #import <AppKit/NSView.h>
 #import <AppKit/NSWindow.h>
+#import <AppKit/NSPanel.h>
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
@@ -43,6 +45,8 @@ wxWindowList       wxModelessWindows;
 // wxTopLevelWindowCocoa implementation
 // ============================================================================
 
+wxTopLevelWindowCocoa *wxTopLevelWindowCocoa::sm_cocoaDeactivateWindow = NULL;
+
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowCocoa creation
 // ----------------------------------------------------------------------------
@@ -57,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,
@@ -74,38 +98,73 @@ 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;
@@ -128,8 +187,16 @@ 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)
 {
+    DeactivatePendingWindow();
     wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeKey",this);
     wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId());
     event.SetEventObject(this);
@@ -144,14 +211,20 @@ void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void)
     GetEventHandler()->ProcessEvent(event);
 }
 
-void wxTopLevelWindowCocoa::Cocoa_close(void)
+void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeMain(void)
+{
+    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeMain",this);
+}
+
+void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignMain(void)
+{
+    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignMain",this);
+}
+
+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()
@@ -215,8 +288,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;
 }