another fix for HP-UX 11.11 vsscanf, should have been in r51260

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

diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index 8cce120e0018a140dfd64956c1fddfb42cbb8ce9..626dba27737cb9a1c940651b6dd1bf567beebdbb 100644 (file)
--- a/src/cocoa/toplevel.mm
+++ b/src/cocoa/toplevel.mm
@@ -222,7 +222,7 @@ void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeKey(void)
     wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeKey"),this);
     wxActivateEvent event(wxEVT_ACTIVATE, true, GetId());
     event.SetEventObject(this);
     wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeKey"),this);
     wxActivateEvent event(wxEVT_ACTIVATE, true, GetId());
     event.SetEventObject(this);

-    GetEventHandler()->ProcessEvent(event);
+    HandleWindowEvent(event);

 }
 
 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void)
 }
 
 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void)


@@ -230,7 +230,7 @@ void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void)
     wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignKey"),this);
     wxActivateEvent event(wxEVT_ACTIVATE, false, GetId());
     event.SetEventObject(this);
     wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignKey"),this);
     wxActivateEvent event(wxEVT_ACTIVATE, false, GetId());
     event.SetEventObject(this);

-    GetEventHandler()->ProcessEvent(event);
+    HandleWindowEvent(event);

 }
 
 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeMain(void)
 }
 
 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeMain(void)


@@ -301,7 +301,7 @@ bool wxTopLevelWindowCocoa::Show(bool show)
         // is shown.  I doubt this will cause any problems though.
         wxSizeEvent event(GetSize(), GetId());
         event.SetEventObject(this);
         // is shown.  I doubt this will cause any problems though.
         wxSizeEvent event(GetSize(), GetId());
         event.SetEventObject(this);

-        GetEventHandler()->ProcessEvent(event);
+        HandleWindowEvent(event);

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


@@ -385,16 +385,22 @@ 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];
 {
     // 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
     NSRect contentRect = [NSWindow

-        contentRectForFrameRect: frameRect
+        contentRectForFrameRect: oldFrameRect

         styleMask: styleMask];
     contentRect.size.width = width;
     contentRect.size.height = height;
         styleMask: styleMask];
     contentRect.size.width = width;
     contentRect.size.height = height;

-    frameRect = [NSWindow
+    NSRect newFrameRect = [NSWindow

         frameRectForContentRect: contentRect
         styleMask: styleMask];
         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)
 }
 
 void wxTopLevelWindowCocoa::DoMoveWindow(int x, int y, int width, int height)