Author: hdu Date: Fri Jan 18 12:28:03 2013 New Revision: 1435109 URL: http://svn.apache.org/viewvc?rev=1435109&view=rev Log: #i119006# disable OSX>=10.7 window restoration until we support it directly
Modified: openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm Modified: openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm?rev=1435109&r1=1435108&r2=1435109&view=diff ============================================================================== --- openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm (original) +++ openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm Fri Jan 18 12:28:03 2013 @@ -162,6 +162,7 @@ static AquaSalFrame* getMouseContainerFr NSWindow* pNSWindow = [super initWithContentRect: aRect styleMask: mpFrame->getStyleMask() backing: NSBackingStoreBuffered defer: NO ]; [pNSWindow useOptimizedDrawing: YES]; // OSX recommendation when there are no overlapping subviews within the receiver + // enable OSX>=10.7 fullscreen options if available and useful bool bAllowFullScreen = (0 == (mpFrame->mnStyle & (SAL_FRAME_STYLE_DIALOG | SAL_FRAME_STYLE_TOOLTIP | SAL_FRAME_STYLE_SYSTEMCHILD | SAL_FRAME_STYLE_FLOAT | SAL_FRAME_STYLE_TOOLWINDOW | SAL_FRAME_STYLE_INTRO))); bAllowFullScreen &= (0 == (~mpFrame->mnStyle & (SAL_FRAME_STYLE_SIZEABLE))); bAllowFullScreen &= (mpFrame->mpParent == NULL); @@ -172,6 +173,11 @@ static AquaSalFrame* getMouseContainerFr [pNSWindow performSelector:setCollectionBehavior withObject:bMode]; } + // disable OSX>=10.7 window restoration until we support it directly + const SEL setRestorable = @selector(setRestorable:); + if( [pNSWindow respondsToSelector: setRestorable]) + [pNSWindow performSelector:setRestorable withObject:NO]; + return pNSWindow; }