don't hang forever in Dispatch() if there is no event loop

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

diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index 39b1b48f9dea7c1b54af0eb3ac073de756261d54..c51f22719aa2b760bc26fd123aba18111178055f 100644 (file)
--- a/src/cocoa/toplevel.mm
+++ b/src/cocoa/toplevel.mm
@@ -28,8 +28,13 @@
     #include "wx/app.h"
 #endif //WX_PRECOMP
 
     #include "wx/app.h"
 #endif //WX_PRECOMP
 

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

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

+#import <AppKit/NSPanel.h>

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


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


@@ -63,6 +88,7 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
                                  long style,
                                  const wxString& name)
 {
                                  long style,
                                  const wxString& name)
 {

+    wxAutoNSAutoreleasePool pool;

     wxTopLevelWindows.Append(this);
 
     if(!CreateBase(parent,winid,pos,size,style,wxDefaultValidator,name))
     wxTopLevelWindows.Append(this);
 
     if(!CreateBase(parent,winid,pos,size,style,wxDefaultValidator,name))


@@ -71,35 +97,37 @@ 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);
+    unsigned int cocoaStyle = NSWindowStyleForWxStyle(style);
+    if(style & wxFRAME_TOOL_WINDOW)
+        cocoaStyle |= NSUtilityWindowMask;

 
 

-    // TODO: Set flags given wxWindows style
-    unsigned int cocoaStyle = 0;
-    cocoaStyle |= NSTitledWindowMask;
-    cocoaStyle |= NSClosableWindowMask;
-    cocoaStyle |= NSMiniaturizableWindowMask;
-    cocoaStyle |= NSResizableWindowMask;
+    // NOTE: y-origin needs to be flipped.
+    NSRect cocoaRect = [NSWindow contentRectForFrameRect:NSMakeRect(pos.x,pos.y,size.x,size.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()
 {

-    // Hand ownership of the content view to wxWindow so it can destroy
-    // itself properly.
-    NSView *view = [m_cocoaNSView retain];
+    wxAutoNSAutoreleasePool pool;
+    DestroyChildren();

     SetNSWindow(NULL);
     SetNSWindow(NULL);

-    SetNSView(view);
-    [view release];

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -122,8 +150,40 @@ void wxTopLevelWindowCocoa::SetNSWindow(WX_NSWindow cocoaNSWindow)
     if(need_debug) wxLogDebug("wxTopLevelWindowCocoa=%p::SetNSWindow [cocoaNSWindow=%p retainCount]=%d",this,cocoaNSWindow,[cocoaNSWindow retainCount]);
 }
 
     if(need_debug) wxLogDebug("wxTopLevelWindowCocoa=%p::SetNSWindow [cocoaNSWindow=%p retainCount]=%d",this,cocoaNSWindow,[cocoaNSWindow retainCount]);
 }
 

-void wxTopLevelWindowCocoa::Cocoa_wxMenuItemAction(wxMenuItem& item)
+void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
+{
+    if([m_cocoaNSWindow contentView] == (id)oldView)
+        [m_cocoaNSWindow setContentView:newView];
+}
+
+void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeKey(void)
+{
+    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeKey",this);
+    wxMenuBarManager::GetInstance()->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);
+    wxMenuBarManager::GetInstance()->WindowDidResignKey(this);
+}
+
+void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeMain(void)
+{
+    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeMain",this);
+    wxMenuBarManager::GetInstance()->WindowDidBecomeMain(this);
+}
+
+void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignMain(void)
+{
+    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignMain",this);
+    wxMenuBarManager::GetInstance()->WindowDidResignMain(this);

 }
 
 void wxTopLevelWindowCocoa::Cocoa_close(void)
 }
 
 void wxTopLevelWindowCocoa::Cocoa_close(void)


@@ -136,7 +196,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);
 }


@@ -169,10 +229,23 @@ void wxTopLevelWindowCocoa::Restore()
 
 bool wxTopLevelWindowCocoa::Show(bool show)
 {
 
 bool wxTopLevelWindowCocoa::Show(bool show)
 {

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

     if(show)
     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;
 }
 


@@ -214,9 +287,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];


@@ -229,7 +318,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


@@ -239,6 +328,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);

 }
 
 }