diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-10-16 10:13:46 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-10-16 11:22:12 +0300 |
| commit | b02e958fa0bf7d062a5b8aff03d22325e3068feb (patch) | |
| tree | e76ec94b574b2f371cbcfe88611dda27d8c80467 /vcl/inc | |
| parent | f9aa686432c0ba62c6f440302d5a35856496a786 (diff) | |
MAC_OS_X_VERSION_MAX_ALLOWED is always >= 1080 now
Change-Id: Ieae67cbf917cdf4bca2b0d6c1697eddc6137dbe2
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/osx/salframe.h | 4 | ||||
| -rw-r--r-- | vcl/inc/osx/salframeview.h | 12 | ||||
| -rw-r--r-- | vcl/inc/quartz/salgdi.h | 9 |
3 files changed, 0 insertions, 25 deletions
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 82bd117284ce..7611b6d7aa08 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -93,11 +93,7 @@ public: sal_uLong mnICOptions; // To prevent display sleep during presentation -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 - boost::shared_ptr< Timer > mpActivityTimer; -#else IOPMAssertionID mnAssertionID; -#endif public: /** Constructor diff --git a/vcl/inc/osx/salframeview.h b/vcl/inc/osx/salframeview.h index 7e957b67acc1..93f8b8f42634 100644 --- a/vcl/inc/osx/salframeview.h +++ b/vcl/inc/osx/salframeview.h @@ -22,11 +22,7 @@ #include "osx/a11ywrapper.h" -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -@interface SalFrameWindow : NSWindow -#else @interface SalFrameWindow : NSWindow<NSWindowDelegate> -#endif { AquaSalFrame* mpFrame; id mDraggingDestinationHandler; @@ -63,11 +59,7 @@ -(void)unregisterDraggingDestinationHandler:(id)theHandler; @end -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -@interface SalFrameView : AquaA11yWrapper <NSTextInput> -#else @interface SalFrameView : AquaA11yWrapper <NSTextInputClient> -#endif { AquaSalFrame* mpFrame; @@ -121,11 +113,7 @@ /* text action methods */ -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 --(void)insertText:(id)aString; -#else -(void)insertText:(id)aString replacementRange:(NSRange)replacementRange; -#endif -(void)insertTab: (id)aSender; -(void)insertBacktab: (id)aSender; -(void)moveLeft: (id)aSender; diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 45a12c4ee63b..23d3bb3904a9 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -29,15 +29,6 @@ #include <ApplicationServices/ApplicationServices.h> #include "osx/osxvcltypes.h" #include "osx/salframe.h" - -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -// The following symbols are SPI (System Programming Interface) in 10.5. -extern "C" { - void CTRunGetAdvances(CTRunRef run, CFRange range, CGSize buffer[]); - const CGSize* CTRunGetAdvancesPtr(CTRunRef run); - extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel; -} -#endif #else #include <CoreGraphics/CoreGraphics.h> #include <CoreText/CoreText.h> |