use reserve() instead of Alloc() in WX_APPEND_ARRAY so that it works with std classes too

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

diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index f2e44d4b44e36da529cded0376d5552409f5dbbd..3e73b00ceb987ff5b635c5742ca1b6179bc55a3e 100644 (file)
--- a/src/cocoa/toplevel.mm
+++ b/src/cocoa/toplevel.mm
@@ -86,6 +86,23 @@ unsigned int wxTopLevelWindowCocoa::NSWindowStyleForWxStyle(long style)
     return styleMask;
 }
 
+NSRect wxTopLevelWindowCocoa::MakeInitialNSWindowContentRect(const wxPoint& pos, const wxSize& size, unsigned int cocoaStyleMask)
+{
+    // Arbitrarily use (100,100) as the origin when default coords are given.
+    wxCoord x = pos.x!=wxDefaultCoord ? pos.x : 100;
+    wxCoord y = pos.y!=wxDefaultCoord ? pos.y : 100;
+
+    wxCoord w = WidthDefault(size.x);
+    wxCoord h = HeightDefault(size.y);
+
+    NSPoint cocoaOrigin = OriginInCocoaScreenCoordinatesForRectInWxDisplayCoordinates(x,y,w,h,true);
+
+    return [NSWindow
+            contentRectForFrameRect:NSMakeRect(cocoaOrigin.x,cocoaOrigin.y,w,h)
+            styleMask:cocoaStyleMask];
+
+}
+
 bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
                                  wxWindowID winid,
                                  const wxString& title,
@@ -107,30 +124,7 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
     if(style & wxFRAME_TOOL_WINDOW)
         cocoaStyle |= NSUtilityWindowMask;
 
-    // Create frame and check and handle default position and size
-    int realx,
-        realy;
-
-    // WX has no set default position - the carbon port caps the low
-    // end at 20, 50.  Here we do the same, except instead of setting
-    // it to 20 and 50, we set it to 100 and 100 if the values are too low
-    if (pos.x < 20)
-        realx = 100;
-    else
-        realx = pos.x;
-
-    if (pos.y < 50)
-        realy = 100;
-    else
-        realy = pos.y;
-
-    int realw = WidthDefault(size.x);
-    int realh = HeightDefault(size.y);
-
-    // NOTE: y-origin needs to be flipped.
-    NSRect cocoaRect = [NSWindow
-                        contentRectForFrameRect:NSMakeRect(realx,realy,realw,realh)
-                        styleMask:cocoaStyle];
+    NSRect cocoaRect = MakeInitialNSWindowContentRect(pos,size,cocoaStyle);
 
     m_cocoaNSWindow = NULL;
     m_cocoaNSView = NULL;
@@ -138,9 +132,9 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
     NSWindow *newWindow;
     // Create a WXNSPanel or a WXNSWindow depending on what type of window is desired.
     if(style & wxFRAME_TOOL_WINDOW)
-        newWindow = [[WXNSPanel alloc] initWithContentRect:cocoaRect styleMask:cocoaStyle backing:NSBackingStoreBuffered defer:NO];
+        newWindow = [[WX_GET_OBJC_CLASS(WXNSPanel) alloc] initWithContentRect:cocoaRect styleMask:cocoaStyle backing:NSBackingStoreBuffered defer:NO];
     else
-        newWindow = [[WXNSWindow alloc] initWithContentRect:cocoaRect styleMask:cocoaStyle backing:NSBackingStoreBuffered defer:NO];
+        newWindow = [[WX_GET_OBJC_CLASS(WXNSWindow) alloc] initWithContentRect:cocoaRect styleMask:cocoaStyle backing:NSBackingStoreBuffered defer:NO];
     // Make sure the default content view is a WXNSView
     [newWindow setContentView: [[WX_GET_OBJC_CLASS(WXNSView) alloc] initWithFrame: [[newWindow contentView] frame]]];
     // Associate the window and view
@@ -391,23 +385,31 @@ 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 oldFrameRect = [m_cocoaNSWindow frame];
     NSRect contentRect = [NSWindow
-        contentRectForFrameRect: frameRect
+        contentRectForFrameRect: oldFrameRect
         styleMask: styleMask];
     contentRect.size.width = width;
     contentRect.size.height = height;
-    frameRect = [NSWindow
+    NSRect newFrameRect = [NSWindow
         frameRectForContentRect: contentRect
         styleMask: styleMask];
-    [m_cocoaNSWindow setFrame: frameRect display: NO];
+
+    // Cocoa uses +y is up but wxWidgets uses +y is down.  We want an increase/decrease in height
+    // to not effect where the top of the window is placed so we set the new y origin relative the
+    // old one taking the height change into account.
+    newFrameRect.origin.y = oldFrameRect.origin.y + oldFrameRect.size.height - newFrameRect.size.height;
+    
+    [m_cocoaNSWindow setFrame: newFrameRect display: NO];
 }
 
 void wxTopLevelWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 {
     wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,wxT("wxTopLevelWindow=%p::DoMoveWindow(%d,%d,%d,%d)"),this,x,y,width,height);
 
-    NSRect cocoaRect = NSMakeRect(x,y,width,height);
+    NSPoint cocoaOrigin = OriginInCocoaScreenCoordinatesForRectInWxDisplayCoordinates(x,y,width,height,false);
+
+    NSRect cocoaRect = NSMakeRect(cocoaOrigin.x,cocoaOrigin.y,width,height);
     [m_cocoaNSWindow setFrame: cocoaRect display:NO];
 }
 
@@ -423,10 +425,14 @@ void wxTopLevelWindowCocoa::DoGetSize(int *w, int *h) const
 
 void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const
 {
-    NSRect cocoaRect = [m_cocoaNSWindow frame];
-    if(x)
-        *x=(int)cocoaRect.origin.x;
-    if(y)
-        *y=(int)cocoaRect.origin.y;
-    wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,wxT("wxTopLevelWindow=%p::DoGetPosition = (%d,%d)"),this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
+    NSRect windowFrame = [m_cocoaNSWindow frame];
+    
+    wxPoint theWxOrigin = OriginInWxDisplayCoordinatesForRectInCocoaScreenCoordinates(windowFrame);
+
+    if(*x)
+        *x = theWxOrigin.x;
+    if(*y)
+        *y = theWxOrigin.y;
+    
+    wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,wxT("wxTopLevelWindow=%p::DoGetPosition = (%d,%d)"),this,(int)theWxOrigin.x,(int)theWxOrigin.y);
 }