Use the correct window as parent of wxInfoBar close button.

[wxWidgets.git] / src / osx / cocoa / nonownedwnd.mm

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index 02664d20f71b5c5da901ec4ac8af5aefc88a9d3b..7f73ffed916ecec4a2a79ceba9417cc001716e00 100644 (file)
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -111,7 +111,7 @@ bool shouldHandleSelector(SEL selector)
     return (wxNonOwnedWindowCocoaImpl*) wxNonOwnedWindowImpl::FindFromWXWindow( self );
 }
 
     return (wxNonOwnedWindowCocoaImpl*) wxNonOwnedWindowImpl::FindFromWXWindow( self );
 }
 

-// TODO in cocoa everything during a drag is sent to the NSWindow the mouse down occured, 
+// TODO in cocoa everything during a drag is sent to the NSWindow the mouse down occurred,

 // this does not conform to the wx behaviour if the window is not captured, so try to resend
 // or capture all wx mouse event handling at the tlw as we did for carbon
 
 // this does not conform to the wx behaviour if the window is not captured, so try to resend
 // or capture all wx mouse event handling at the tlw as we did for carbon
 


@@ -120,12 +120,22 @@ bool shouldHandleSelector(SEL selector)
     bool handled = false;
     if ( ([event type] >= NSLeftMouseDown) && ([event type] <= NSMouseExited) )
     {
     bool handled = false;
     if ( ([event type] >= NSLeftMouseDown) && ([event type] <= NSMouseExited) )
     {

+        WXEVENTREF formerEvent = wxTheApp == NULL ? NULL : wxTheApp->MacGetCurrentEvent();
+        WXEVENTHANDLERCALLREF formerHandler = wxTheApp == NULL ? NULL : wxTheApp->MacGetCurrentEventHandlerCallRef();
+

         wxWindow* cw = wxWindow::GetCapture();
         if ( cw != NULL )
         {
         wxWindow* cw = wxWindow::GetCapture();
         if ( cw != NULL )
         {

+            if (wxTheApp)
+                wxTheApp->MacSetCurrentEvent(event, NULL);

             ((wxWidgetCocoaImpl*)cw->GetPeer())->DoHandleMouseEvent( event);
             handled = true;
         }
             ((wxWidgetCocoaImpl*)cw->GetPeer())->DoHandleMouseEvent( event);
             handled = true;
         }

+        if ( handled )
+        {
+            if (wxTheApp)
+                wxTheApp->MacSetCurrentEvent(formerEvent , formerHandler);
+        }

     }
     return handled;
 }
     }
     return handled;
 }


@@ -241,7 +251,18 @@ bool shouldHandleSelector(SEL selector)
 - (void)sendEvent:(NSEvent *) event
 {
     if ( ![self WX_filterSendEvent: event] )
 - (void)sendEvent:(NSEvent *) event
 {
     if ( ![self WX_filterSendEvent: event] )

+    {
+        WXEVENTREF formerEvent = wxTheApp == NULL ? NULL : wxTheApp->MacGetCurrentEvent();
+        WXEVENTHANDLERCALLREF formerHandler = wxTheApp == NULL ? NULL : wxTheApp->MacGetCurrentEventHandlerCallRef();
+        
+        if (wxTheApp)
+            wxTheApp->MacSetCurrentEvent(event, NULL);
+        

         [super sendEvent: event];
         [super sendEvent: event];

+        
+        if (wxTheApp)
+            wxTheApp->MacSetCurrentEvent(formerEvent , formerHandler);
+    }

 }
 
 @end
 }
 
 @end


@@ -271,7 +292,7 @@ extern int wxOSXGetIdFromSelector(SEL action );
 
 - (id) init
 {
 
 - (id) init
 {

-    [super init];
+    self = [super init];

     return self;
 }
 
     return self;
 }
 


@@ -452,10 +473,11 @@ extern int wxOSXGetIdFromSelector(SEL action );
             editor = [[wxNSTextFieldEditor alloc] init];
             [editor setFieldEditor:YES];
             [tf setFieldEditor:editor];
             editor = [[wxNSTextFieldEditor alloc] init];
             [editor setFieldEditor:YES];
             [tf setFieldEditor:editor];

+            [editor release];

         }
         return editor;
         }
         return editor;

-    }
-
+    } 
+ 

     return nil;
 }
 
     return nil;
 }
 


@@ -495,6 +517,12 @@ wxNonOwnedWindowCocoaImpl::~wxNonOwnedWindowCocoaImpl()
     if ( !m_wxPeer->IsNativeWindowWrapper() )
     {
         [m_macWindow setDelegate:nil];
     if ( !m_wxPeer->IsNativeWindowWrapper() )
     {
         [m_macWindow setDelegate:nil];

+     
+        // make sure we remove this first, otherwise the ref count will not lead to the 
+        // native window's destruction
+        if ([m_macWindow parentWindow] != 0)
+            [[m_macWindow parentWindow] removeChildWindow: m_macWindow];
+

         [m_macWindow release];
     }
 }
         [m_macWindow release];
     }
 }


@@ -531,30 +559,10 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
     if ( style & wxFRAME_TOOL_WINDOW )
     {
         windowstyle |= NSUtilityWindowMask;
     if ( style & wxFRAME_TOOL_WINDOW )
     {
         windowstyle |= NSUtilityWindowMask;

-        if ( ( style & wxMINIMIZE_BOX ) || ( style & wxMAXIMIZE_BOX ) ||
-            ( style & wxCLOSE_BOX ) || ( style & wxSYSTEM_MENU ) )
-        {
-            windowstyle |= NSTitledWindowMask ;
-        }

     }
     else if ( ( style & wxPOPUP_WINDOW ) )
     {
         level = kCGPopUpMenuWindowLevel;
     }
     else if ( ( style & wxPOPUP_WINDOW ) )
     {
         level = kCGPopUpMenuWindowLevel;

-        /*
-        if ( ( style & wxBORDER_NONE ) )
-        {
-            wclass = kHelpWindowClass ;   // has no border
-            attr |= kWindowNoShadowAttribute;
-        }
-        else
-        {
-            wclass = kPlainWindowClass ;  // has a single line border, it will have to do for now
-        }
-        */
-    }
-    else if ( ( style & wxCAPTION ) )
-    {
-        windowstyle |= NSTitledWindowMask ;

     }
     else if ( ( style & wxFRAME_DRAWER ) )
     {
     }
     else if ( ( style & wxFRAME_DRAWER ) )
     {


@@ -562,40 +570,24 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
         wclass = kDrawerWindowClass;
         */
     }
         wclass = kDrawerWindowClass;
         */
     }

-    else
-    {
-        // set these even if we have no title, otherwise the controls won't be visible
-        if ( ( style & wxMINIMIZE_BOX ) || ( style & wxMAXIMIZE_BOX ) ||
-            ( style & wxCLOSE_BOX ) || ( style & wxSYSTEM_MENU ) )
-        {
-            windowstyle |= NSTitledWindowMask ;
-        }
-        /*
-        else if ( ( style & wxNO_BORDER ) )
-        {
-            wclass = kSimpleWindowClass ;
-        }
-        else
-        {
-            wclass = kPlainWindowClass ;
-        }
-        */
-    }
-
-    if ( windowstyle & NSTitledWindowMask )
+ 
+    if ( ( style & wxMINIMIZE_BOX ) || ( style & wxMAXIMIZE_BOX ) ||
+        ( style & wxCLOSE_BOX ) || ( style & wxSYSTEM_MENU ) || ( style & wxCAPTION ) )

     {
     {

+        windowstyle |= NSTitledWindowMask ;

         if ( ( style & wxMINIMIZE_BOX ) )
             windowstyle |= NSMiniaturizableWindowMask ;
         if ( ( style & wxMINIMIZE_BOX ) )
             windowstyle |= NSMiniaturizableWindowMask ;

-
+        

         if ( ( style & wxMAXIMIZE_BOX ) )
         if ( ( style & wxMAXIMIZE_BOX ) )

-            windowstyle |= NSResizableWindowMask ; // TODO showing ZOOM ?
-
-        if ( ( style & wxRESIZE_BORDER ) )

             windowstyle |= NSResizableWindowMask ;
             windowstyle |= NSResizableWindowMask ;

-
+        

         if ( ( style & wxCLOSE_BOX) )
             windowstyle |= NSClosableWindowMask ;
     }
         if ( ( style & wxCLOSE_BOX) )
             windowstyle |= NSClosableWindowMask ;
     }

+    
+    if ( ( style & wxRESIZE_BORDER ) )
+        windowstyle |= NSResizableWindowMask ;
+

     if ( extraStyle & wxFRAME_EX_METAL)
         windowstyle |= NSTexturedBackgroundWindowMask;
 
     if ( extraStyle & wxFRAME_EX_METAL)
         windowstyle |= NSTexturedBackgroundWindowMask;
 


@@ -614,7 +606,16 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
         backing:NSBackingStoreBuffered
         defer:NO
         ];
         backing:NSBackingStoreBuffered
         defer:NO
         ];

-
+    
+    // if we just have a title bar with no buttons needed, hide them
+    if ( (windowstyle & NSTitledWindowMask) && 
+        !(style & wxCLOSE_BOX) && !(style & wxMAXIMIZE_BOX) && !(style & wxMINIMIZE_BOX) )
+    {
+        [[m_macWindow standardWindowButton:NSWindowZoomButton] setHidden:YES];
+        [[m_macWindow standardWindowButton:NSWindowCloseButton] setHidden:YES];
+        [[m_macWindow standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
+    }
+    

     // If the parent is modal, windows with wxFRAME_FLOAT_ON_PARENT style need
     // to be in kCGUtilityWindowLevel and not kCGFloatingWindowLevel to stay
     // above the parent.
     // If the parent is modal, windows with wxFRAME_FLOAT_ON_PARENT style need
     // to be in kCGUtilityWindowLevel and not kCGFloatingWindowLevel to stay
     // above the parent.


@@ -643,8 +644,6 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
 
     [m_macWindow setDelegate:controller];
 
 
     [m_macWindow setDelegate:controller];
 

-    [m_macWindow setAcceptsMouseMovedEvents: YES];
-    

     if ( ( style & wxFRAME_SHAPED) )
     {
         [m_macWindow setOpaque:NO];
     if ( ( style & wxFRAME_SHAPED) )
     {
         [m_macWindow setOpaque:NO];


@@ -686,14 +685,35 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show)
     if ( show )
     {
         wxNonOwnedWindow* wxpeer = GetWXPeer(); 
     if ( show )
     {
         wxNonOwnedWindow* wxpeer = GetWXPeer(); 

-        if (wxpeer && !(wxpeer->GetWindowStyle() & wxFRAME_TOOL_WINDOW)) 
-            [m_macWindow makeKeyAndOrderFront:nil];
-        else 
-            [m_macWindow orderFront:nil]; 
+        if ( wxpeer )
+        {
+            // add to parent window before showing
+            wxDialog * const dialog = wxDynamicCast(wxpeer, wxDialog);
+            if ( wxpeer->GetParent() && dialog && dialog->IsModal())
+            {
+                NSView * parentView = wxpeer->GetParent()->GetPeer()->GetWXWidget();
+                if ( parentView )
+                {
+                    NSWindow* parentNSWindow = [parentView window];
+                    if ( parentNSWindow )
+                        [parentNSWindow addChildWindow:m_macWindow ordered:NSWindowAbove];
+                }
+            }
+            
+            if (!(wxpeer->GetWindowStyle() & wxFRAME_TOOL_WINDOW)) 
+                [m_macWindow makeKeyAndOrderFront:nil];
+            else 
+                [m_macWindow orderFront:nil]; 
+        }

         [[m_macWindow contentView] setNeedsDisplay: YES];
     }
     else
         [[m_macWindow contentView] setNeedsDisplay: YES];
     }
     else

+    {
+        // avoid propagation of orderOut to parent 
+        if ([m_macWindow parentWindow] != 0)
+            [[m_macWindow parentWindow] removeChildWindow: m_macWindow];

         [m_macWindow orderOut:nil];
         [m_macWindow orderOut:nil];

+    }

     return true;
 }
 
     return true;
 }
 


@@ -716,8 +736,12 @@ bool wxNonOwnedWindowCocoaImpl::SetTransparent(wxByte alpha)
     return true;
 }
 
     return true;
 }
 

-bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& WXUNUSED(col) )
+bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& col )

 {
 {

+    [m_macWindow setBackgroundColor:[NSColor colorWithCalibratedRed:(CGFloat) (col.Red() / 255.0)
+                                                             green:(CGFloat) (col.Green() / 255.0)
+                                                              blue:(CGFloat) (col.Blue() / 255.0)
+                                                             alpha:(CGFloat) (col.Alpha() / 255.0)]];

     return true;
 }
 
     return true;
 }
 


@@ -853,6 +877,7 @@ void wxNonOwnedWindowCocoaImpl::Maximize(bool WXUNUSED(maximize))
 
 typedef struct
 {
 
 typedef struct
 {

+    NSUInteger m_formerStyleMask;

     int m_formerLevel;
     NSRect m_formerFrame;
 } FullScreenData ;
     int m_formerLevel;
     NSRect m_formerFrame;
 } FullScreenData ;


@@ -873,6 +898,7 @@ bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style))
         m_macFullScreenData = data ;
         data->m_formerLevel = [m_macWindow level];
         data->m_formerFrame = [m_macWindow frame];
         m_macFullScreenData = data ;
         data->m_formerLevel = [m_macWindow level];
         data->m_formerFrame = [m_macWindow frame];

+        data->m_formerStyleMask = [m_macWindow styleMask];

 #if 0
         // CGDisplayCapture( kCGDirectMainDisplay );
         //[m_macWindow setLevel:NSMainMenuWindowLevel+1/*CGShieldingWindowLevel()*/];
 #if 0
         // CGDisplayCapture( kCGDirectMainDisplay );
         //[m_macWindow setLevel:NSMainMenuWindowLevel+1/*CGShieldingWindowLevel()*/];


@@ -880,16 +906,24 @@ bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style))
         NSRect screenframe = [[NSScreen mainScreen] frame];
         NSRect frame = NSMakeRect (0, 0, 100, 100);
         NSRect contentRect;
         NSRect screenframe = [[NSScreen mainScreen] frame];
         NSRect frame = NSMakeRect (0, 0, 100, 100);
         NSRect contentRect;

+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+        if ( [ m_macWindow respondsToSelector:@selector(setStyleMask:) ] )
+            [m_macWindow setStyleMask:data->m_formerStyleMask & ~ NSResizableWindowMask];
+#endif
+        

         contentRect = [NSWindow contentRectForFrameRect: frame
         contentRect = [NSWindow contentRectForFrameRect: frame

-                                styleMask: NSTitledWindowMask];
+                                styleMask: [m_macWindow styleMask]];

         screenframe.origin.y += (frame.origin.y - contentRect.origin.y);
         screenframe.size.height += (frame.size.height - contentRect.size.height);
         [m_macWindow setFrame:screenframe display:YES];
 
         screenframe.origin.y += (frame.origin.y - contentRect.origin.y);
         screenframe.size.height += (frame.size.height - contentRect.size.height);
         [m_macWindow setFrame:screenframe display:YES];
 

-        OSStatus error = SetSystemUIMode(kUIModeAllHidden,
+        SetSystemUIMode(kUIModeAllHidden,

                                 kUIOptionDisableAppleMenu
                                 kUIOptionDisableAppleMenu

+                        /*

                                 | kUIOptionDisableProcessSwitch
                                 | kUIOptionDisableProcessSwitch

-                                | kUIOptionDisableForceQuit); 
+                                | kUIOptionDisableForceQuit
+                         */); 

     }
     else if ( m_macFullScreenData != NULL )
     {
     }
     else if ( m_macFullScreenData != NULL )
     {


@@ -900,10 +934,14 @@ bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style))
 #endif
         
         [m_macWindow setFrame:data->m_formerFrame display:YES];
 #endif
         
         [m_macWindow setFrame:data->m_formerFrame display:YES];

+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+        if ( [ m_macWindow respondsToSelector:@selector(setStyleMask:) ] )
+            [m_macWindow setStyleMask:data->m_formerStyleMask];
+#endif

         delete data ;
         m_macFullScreenData = NULL ;
 
         delete data ;
         m_macFullScreenData = NULL ;
 

-        OSStatus error = SetSystemUIMode(kUIModeNormal, 0); 
+        SetSystemUIMode(kUIModeNormal, 0); 

     }
 
     return true;
     }
 
     return true;


@@ -971,6 +1009,11 @@ bool wxNonOwnedWindowCocoaImpl::IsModified() const
     return [m_macWindow isDocumentEdited];
 }
 
     return [m_macWindow isDocumentEdited];
 }
 

+void wxNonOwnedWindowCocoaImpl::SetRepresentedFilename(const wxString& filename)
+{
+    [m_macWindow setRepresentedFilename:wxCFStringRef(filename).AsNSString()];
+}
+

 void wxNonOwnedWindowCocoaImpl::RestoreWindowLevel()
 {
     if ( [m_macWindow level] != m_macWindowLevel )
 void wxNonOwnedWindowCocoaImpl::RestoreWindowLevel()
 {
     if ( [m_macWindow level] != m_macWindowLevel )