Applied [ 857819 ] STC CopyToClipboard uses LF on win32

[wxWidgets.git] / src / cocoa / toplevel.mm

diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index 068d4bd7242e1f57c045440992a113a516fab1f2..7a7c11cbb0700e26cb0f93dcabb974ea53f6f0e1 100644 (file)
--- a/src/cocoa/toplevel.mm
+++ b/src/cocoa/toplevel.mm
@@ -4,9 +4,9 @@
 // Author:      David Elliott 
 // Modified by:
 // Created:     2002/11/27
 // Author:      David Elliott 
 // Modified by:
 // Created:     2002/11/27

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 2002 David Elliott
 // Copyright:   (c) 2002 David Elliott

-// License:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -29,9 +29,11 @@
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"

+#include "wx/cocoa/string.h"

 
 #import <AppKit/NSView.h>
 #import <AppKit/NSWindow.h>
 
 #import <AppKit/NSView.h>
 #import <AppKit/NSWindow.h>

+#import <AppKit/NSPanel.h>

 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------


@@ -43,6 +45,8 @@ wxWindowList       wxModelessWindows;
 // wxTopLevelWindowCocoa implementation
 // ============================================================================
 
 // wxTopLevelWindowCocoa implementation
 // ============================================================================
 

+wxTopLevelWindowCocoa *wxTopLevelWindowCocoa::sm_cocoaDeactivateWindow = NULL;
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowCocoa creation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowCocoa creation
 // ----------------------------------------------------------------------------


@@ -57,6 +61,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,
                                  wxWindowID winid,
                                  const wxString& title,
 bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
                                  wxWindowID winid,
                                  const wxString& title,


@@ -74,38 +98,73 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
     if ( parent )
         parent->AddChild(this);
 
     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;
 
     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];
 
     // 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()
 {
     return TRUE;
 }
 
 wxTopLevelWindowCocoa::~wxTopLevelWindowCocoa()
 {

+    wxASSERT(sm_cocoaDeactivateWindow!=this);

     wxAutoNSAutoreleasePool pool;
     DestroyChildren();
     SetNSWindow(NULL);
 }
 
     wxAutoNSAutoreleasePool pool;
     DestroyChildren();
     SetNSWindow(NULL);
 }
 

+bool wxTopLevelWindowCocoa::Destroy()
+{
+    if(sm_cocoaDeactivateWindow==this)
+    {
+        sm_cocoaDeactivateWindow = NULL;
+        wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey();
+    }
+    return wxTopLevelWindowBase::Destroy();
+}
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowCocoa Cocoa Specifics
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // 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;
 void wxTopLevelWindowCocoa::SetNSWindow(WX_NSWindow cocoaNSWindow)
 {
     bool need_debug = cocoaNSWindow || m_cocoaNSWindow;


@@ -124,15 +183,45 @@ void wxTopLevelWindowCocoa::SetNSWindow(WX_NSWindow cocoaNSWindow)
 
 void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
 {
 
 void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
 {

-    if([m_cocoaNSWindow contentView] == oldView)
+    if([m_cocoaNSWindow contentView] == (id)oldView)

         [m_cocoaNSWindow setContentView:newView];
 }
 
         [m_cocoaNSWindow setContentView:newView];
 }
 

-void wxTopLevelWindowCocoa::Cocoa_wxMenuItemAction(wxMenuItem& item)
+/*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);
+    GetEventHandler()->ProcessEvent(event);
+}
+
+void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void)
+{
+    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignKey",this);
+    wxActivateEvent event(wxEVT_ACTIVATE, FALSE, GetId());
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);
+}
+
+void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeMain(void)

 {
 {

+    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeMain",this);

 }
 
 }
 

-void wxTopLevelWindowCocoa::Cocoa_close(void)
+void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignMain(void)
+{
+    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignMain",this);
+}
+
+void wxTopLevelWindowCocoa::CocoaDelegate_windowWillClose(void)

 {
     m_closed = true;
     Destroy();
 {
     m_closed = true;
     Destroy();


@@ -142,7 +231,7 @@ void wxTopLevelWindowCocoa::Cocoa_close(void)
     wxTheApp->CocoaInstallRequestedIdleHandler();
 }
 
     wxTheApp->CocoaInstallRequestedIdleHandler();
 }
 

-bool wxTopLevelWindowCocoa::Cocoa_windowShouldClose()
+bool wxTopLevelWindowCocoa::CocoaDelegate_windowShouldClose()

 {
     return wxWindowBase::Close(false);
 }
 {
     return wxWindowBase::Close(false);
 }


@@ -175,11 +264,23 @@ void wxTopLevelWindowCocoa::Restore()
 
 bool wxTopLevelWindowCocoa::Show(bool show)
 {
 
 bool wxTopLevelWindowCocoa::Show(bool show)
 {

+    if(m_isShown == show)
+        return false;

     wxAutoNSAutoreleasePool pool;
     if(show)
     wxAutoNSAutoreleasePool pool;
     if(show)

+    {
+        // Send the window a size event because wxWindows apps expect it
+        // NOTE: This should really only be done the first time a window
+        // is shown.  I doubt this will cause any problems though.
+        wxSizeEvent event(GetSize(), GetId());
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
+

         [m_cocoaNSWindow makeKeyAndOrderFront:m_cocoaNSWindow];
         [m_cocoaNSWindow makeKeyAndOrderFront:m_cocoaNSWindow];

+    }

     else
         [m_cocoaNSWindow orderOut:m_cocoaNSWindow];
     else
         [m_cocoaNSWindow orderOut:m_cocoaNSWindow];

+    m_isShown = show;

     return true;
 }
 
     return true;
 }
 


@@ -191,8 +292,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
     // 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;
 }
     [m_cocoaNSWindow performClose:m_cocoaNSWindow];
     return m_closed;
 }


@@ -221,9 +322,25 @@ bool wxTopLevelWindowCocoa::IsFullScreen() const
     return FALSE;
 }
 
     return FALSE;
 }
 

+void wxTopLevelWindowCocoa::CocoaSetWxWindowSize(int width, int height)
+{
+    // Set the NSView size by setting the frame size to enclose it
+    unsigned int styleMask = [m_cocoaNSWindow styleMask];
+    NSRect frameRect = [m_cocoaNSWindow frame];
+    NSRect contentRect = [NSWindow
+        contentRectForFrameRect: frameRect
+        styleMask: styleMask];
+    contentRect.size.width = width;
+    contentRect.size.height = height;
+    frameRect = [NSWindow
+        frameRectForContentRect: contentRect
+        styleMask: styleMask];
+    [m_cocoaNSWindow setFrame: frameRect display: NO];
+}
+

 void wxTopLevelWindowCocoa::DoMoveWindow(int x, int y, 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);
+//    wxLogDebug("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];
 
     NSRect cocoaRect = NSMakeRect(x,y,width,height);
     [m_cocoaNSWindow setFrame: cocoaRect display:NO];


@@ -236,7 +353,7 @@ void wxTopLevelWindowCocoa::DoGetSize(int *w, int *h) const
         *w=(int)cocoaRect.size.width;
     if(h)
         *h=(int)cocoaRect.size.height;
         *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);
+//    wxLogDebug("wxTopLevelWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);

 }
 
 void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const
 }
 
 void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const


@@ -246,6 +363,6 @@ void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const
         *x=(int)cocoaRect.origin.x;
     if(y)
         *y=(int)cocoaRect.origin.y;
         *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);
+//    wxLogDebug("wxTopLevelWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);

 }
 
 }