missing release

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

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index 35e755322965b1080d4b9b1e0a3d378192df575c..821b444be25a0973d0f73c76816c2890c33714d0 100644 (file)
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -19,9 +19,19 @@
 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 

+NSScreen* wxOSXGetMenuScreen()
+{
+    if ( [NSScreen screens] == nil )
+        return [NSScreen mainScreen];
+    else 
+    {
+        return [[NSScreen screens] objectAtIndex:0];
+    }
+}
+

 NSRect wxToNSRect( NSView* parent, const wxRect& r )
 {
 NSRect wxToNSRect( NSView* parent, const wxRect& r )
 {

-    NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
+    NSRect frame = parent ? [parent bounds] : [wxOSXGetMenuScreen() frame];

     int y = r.y;
     int x = r.x ;
     if ( parent == NULL || ![ parent isFlipped ] )
     int y = r.y;
     int x = r.x ;
     if ( parent == NULL || ![ parent isFlipped ] )


@@ -31,7 +41,7 @@ NSRect wxToNSRect( NSView* parent, const wxRect& r )
 
 wxRect wxFromNSRect( NSView* parent, const NSRect& rect )
 {
 
 wxRect wxFromNSRect( NSView* parent, const NSRect& rect )
 {

-    NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
+    NSRect frame = parent ? [parent bounds] : [wxOSXGetMenuScreen() frame];

     int y = (int)rect.origin.y;
     int x = (int)rect.origin.x;
     if ( parent == NULL || ![ parent isFlipped ] )
     int y = (int)rect.origin.y;
     int x = (int)rect.origin.x;
     if ( parent == NULL || ![ parent isFlipped ] )


@@ -41,7 +51,7 @@ wxRect wxFromNSRect( NSView* parent, const NSRect& rect )
 
 NSPoint wxToNSPoint( NSView* parent, const wxPoint& p )
 {
 
 NSPoint wxToNSPoint( NSView* parent, const wxPoint& p )
 {

-    NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
+    NSRect frame = parent ? [parent bounds] : [wxOSXGetMenuScreen() frame];

     int x = p.x ;
     int y = p.y;
     if ( parent == NULL || ![ parent isFlipped ] )
     int x = p.x ;
     int y = p.y;
     if ( parent == NULL || ![ parent isFlipped ] )


@@ -51,7 +61,7 @@ NSPoint wxToNSPoint( NSView* parent, const wxPoint& p )
 
 wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
 {
 
 wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
 {

-    NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
+    NSRect frame = parent ? [parent bounds] : [wxOSXGetMenuScreen() frame];

     int x = (int)p.x;
     int y = (int)p.y;
     if ( parent == NULL || ![ parent isFlipped ] )
     int x = (int)p.x;
     int y = (int)p.y;
     if ( parent == NULL || ![ parent isFlipped ] )


@@ -67,6 +77,7 @@ bool shouldHandleSelector(SEL selector)
             || selector == @selector(deleteForward:)
             || selector == @selector(insertNewline:)
             || selector == @selector(insertTab:)
             || selector == @selector(deleteForward:)
             || selector == @selector(insertNewline:)
             || selector == @selector(insertTab:)

+            || selector == @selector(insertBacktab:)

             || selector == @selector(keyDown:)
             || selector == @selector(keyUp:)
             || selector == @selector(scrollPageUp:)
             || selector == @selector(keyDown:)
             || selector == @selector(keyUp:)
             || selector == @selector(scrollPageUp:)


@@ -189,12 +200,22 @@ bool shouldHandleSelector(SEL selector)
 {
 }
 
 {
 }
 

+- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen;

 - (void)noResponderFor: (SEL) selector;
 - (void)sendEvent:(NSEvent *)event;
 @end
 
 @implementation wxNSPanel
 
 - (void)noResponderFor: (SEL) selector;
 - (void)sendEvent:(NSEvent *)event;
 @end
 
 @implementation wxNSPanel
 

+- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen
+{
+    wxNonOwnedWindowCocoaImpl* impl = (wxNonOwnedWindowCocoaImpl*) wxNonOwnedWindowImpl::FindFromWXWindow( self );
+    if (impl && impl->IsFullScreen())
+        return frameRect;
+    else
+        return [super constrainFrameRect:frameRect toScreen:screen];
+}
+

 - (BOOL)canBecomeKeyWindow
 {
     return YES;
 - (BOOL)canBecomeKeyWindow
 {
     return YES;


@@ -777,7 +798,14 @@ bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style))
         data->m_formerFrame = [m_macWindow frame];
         CGDisplayCapture( kCGDirectMainDisplay );
         [m_macWindow setLevel:CGShieldingWindowLevel()];
         data->m_formerFrame = [m_macWindow frame];
         CGDisplayCapture( kCGDirectMainDisplay );
         [m_macWindow setLevel:CGShieldingWindowLevel()];

-        [m_macWindow setFrame:[[NSScreen mainScreen] frame] display:YES];
+        NSRect screenframe = [[NSScreen mainScreen] frame];
+        NSRect frame = NSMakeRect (0, 0, 100, 100);
+        NSRect contentRect;
+        contentRect = [NSWindow contentRectForFrameRect: frame
+                                styleMask: NSTitledWindowMask];
+        screenframe.origin.y += (frame.origin.y - contentRect.origin.y);
+        screenframe.size.height += (frame.size.height - contentRect.size.height);
+        [m_macWindow setFrame:screenframe display:YES];

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