X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e875c17db746544c0f02c628da521542d0f2f059..6de7047076f388adc95b2eb5c95d5860d65f2f7d:/src/cocoa/toplevel.mm?ds=sidebyside diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm index f2e44d4b44..b4b55f1b53 100644 --- a/src/cocoa/toplevel.mm +++ b/src/cocoa/toplevel.mm @@ -32,6 +32,7 @@ #include "wx/cocoa/autorelease.h" #include "wx/cocoa/string.h" +#include "wx/cocoa/ObjcRef.h" #include "wx/cocoa/objc/NSView.h" #include "wx/cocoa/objc/NSWindow.h" @@ -86,6 +87,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 +125,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 +133,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 @@ -196,8 +191,8 @@ void wxTopLevelWindowCocoa::SetNSWindow(WX_NSWindow cocoaNSWindow) bool need_debug = cocoaNSWindow || m_cocoaNSWindow; if(need_debug) wxLogTrace(wxTRACE_COCOA_RetainRelease,wxT("wxTopLevelWindowCocoa=%p::SetNSWindow [m_cocoaNSWindow=%p retainCount]=%d"),this,m_cocoaNSWindow,[m_cocoaNSWindow retainCount]); DisassociateNSWindow(m_cocoaNSWindow); - [cocoaNSWindow retain]; - [m_cocoaNSWindow release]; + wxGCSafeRetain(cocoaNSWindow); + wxGCSafeRelease(m_cocoaNSWindow); m_cocoaNSWindow = cocoaNSWindow; // NOTE: We are no longer using posing so we won't get events on the // window's view unless it was explicitly created as the wx view class. @@ -228,7 +223,7 @@ void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeKey(void) 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) @@ -236,7 +231,7 @@ void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void) 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) @@ -307,7 +302,7 @@ bool wxTopLevelWindowCocoa::Show(bool show) // 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]; } @@ -358,21 +353,26 @@ wxString wxTopLevelWindowCocoa::GetTitle() const wxWindow* wxTopLevelWindowCocoa::SetDefaultItem(wxWindow *win) { wxWindow *old = wxTopLevelWindowBase::SetDefaultItem(win); - NSView *newView = win->GetNSView(); NSCell *newCell; - // newView does not have to be an NSControl, we only cast to NSControl* - // to silence the warning about cell not being implemented. - if(newView != nil && [newView respondsToSelector:@selector(cell)]) - newCell = [(NSControl*)newView cell]; + if(win != NULL) + { + NSView *newView = win->GetNSView(); + // newView does not have to be an NSControl, we only cast to NSControl* + // to silence the warning about cell not being implemented. + if(newView != nil && [newView respondsToSelector:@selector(cell)]) + newCell = [(NSControl*)newView cell]; + else + newCell = nil; + + if(newCell != nil && ![newCell isKindOfClass:[NSButtonCell class]]) + { // It's not an NSButtonCell, set the default to nil. + newCell = nil; + } + } else newCell = nil; - if(newCell != nil && ![newCell isKindOfClass:[NSButtonCell class]]) - { // It's not an NSButtonCell, set the default to nil. - newCell = nil; - } - [GetNSWindow() setDefaultButtonCell:(NSButtonCell*)newCell]; return old; } @@ -391,23 +391,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 +431,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); }