summaryrefslogtreecommitdiff
path: root/vcl/aqua/source/window/salframe.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/aqua/source/window/salframe.cxx')
-rw-r--r--vcl/aqua/source/window/salframe.cxx58
1 files changed, 0 insertions, 58 deletions
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 388dffd90a8f..da36cfab633f 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -46,25 +46,6 @@
#include <Carbon/Carbon.h>
#include "postmac.h"
-#if MACOSX_SDK_VERSION < 1070
-
-enum {
- NSFullScreenWindowMask = (1 << 14)
-};
-
-enum {
- NSWindowCollectionBehaviorFullScreenPrimary = (1 << 7),
- NSWindowCollectionBehaviorFullScreenAuxiliary = (1 << 8)
-};
-
-#if MACOSX_SDK_VERSION < 1050
-
-typedef NSUInteger NSWindowCollectionBehavior;
-
-#endif
-
-#endif
-
using namespace std;
// =======================================================================
@@ -214,31 +195,6 @@ void AquaSalFrame::initWindowAndView()
return;
}
- // On 10.7 and later, if the window is suitable and is
- // resizable, we make it full-screenable.
-
- bool bAllowFullScreen = (0 == (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 == (~mnStyle & (SAL_FRAME_STYLE_SIZEABLE)));
- bAllowFullScreen &= (mpParent == NULL);
-
- if (GetSalData()->mnSystemVersion >= 0x1070 &&
- ((mnStyleMask & NSTitledWindowMask) && (mnStyleMask & NSResizableWindowMask))) {
-
- // Hmm. The docs say that one should use NSInvocation whenever
- // the method does not return an object. collectionBehavior
- // returns an NSWindowCollectionBehavior (NSUInteger). So
- // should I? Or maybe I should just use the low-level
- // objc_msgSend()?
- NSWindowCollectionBehavior behavior = (NSWindowCollectionBehavior) [mpWindow performSelector: @selector(collectionBehavior)];
-
- SAL_INFO("vcl.macosx", OSL_THIS_FUNC << ": bAllowFullScreen=" << bAllowFullScreen << ", behavior=" << hex << behavior);
-
- [mpWindow performSelector: @selector(setCollectionBehavior:) withObject: (id) (behavior | (bAllowFullScreen ? NSWindowCollectionBehaviorFullScreenPrimary : NSWindowCollectionBehaviorFullScreenAuxiliary))];
-
- behavior = (NSWindowCollectionBehavior) [mpWindow performSelector: @selector(collectionBehavior)];
- SAL_INFO("vcl.macosx", OSL_THIS_FUNC << ": after setCollectionBehavior: behavior=" << hex << behavior);
- }
-
if( (mnStyle & SAL_FRAME_STYLE_TOOLTIP) )
[mpWindow setIgnoresMouseEvents: YES];
else
@@ -791,20 +747,6 @@ void AquaSalFrame::ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay )
mbFullScreen = bFullScreen;
- if (GetSalData()->mnSystemVersion >= 0x1070) {
- // If the system full-screen state already is our desired, do nothing
- if ((([mpWindow styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask) == mbFullScreen)
- return;
-
- SAL_INFO("vcl.macosx", OSL_THIS_FUNC << ": calling toggleFullScreen()");
-
- // Otherwise toggle the system full-screen state
- [mpWindow performSelector: @selector(toggleFullScreen:)];
-
- // Nothing more to do?
- return;
- }
-
if( bFullScreen )
{
// hide the dock and the menubar if we are on the menu screen