From 6ab0c87b9bab39dae438cece67b1eba044e1dd07 Mon Sep 17 00:00:00 2001 From: rmottola Date: Wed, 28 Oct 2015 00:42:40 +0000 Subject: [PATCH] Stub 10.8 methods for allowsMagnification git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@39099 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Headers/AppKit/NSScrollView.h | 4 ++++ Source/NSScrollView.m | 11 +++++++++++ 3 files changed, 21 insertions(+) diff --git a/ChangeLog b/ChangeLog index b7f0aa14c..f6cc5d497 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-10-28 Riccardo Mottola + + * Headers/AppKit/NSScrollView.h + * Source/NSScrollView.m + Stub 10.8 methods for allowsMagnification. + 2015-10-28 Fred Kiefer * Source/NSPasteboard.m (-_pbs): Fix waiting forever if gpbs diff --git a/Headers/AppKit/NSScrollView.h b/Headers/AppKit/NSScrollView.h index 8c0456cac..910fa15de 100644 --- a/Headers/AppKit/NSScrollView.h +++ b/Headers/AppKit/NSScrollView.h @@ -159,6 +159,10 @@ typedef NSInteger NSScrollElasticity; - (NSScrollElasticity)verticalScrollElasticity; - (void)setVerticalScrollElasticity:(NSScrollElasticity)value; #endif +#if OS_API_VERSION(MAC_OS_X_VERSION_10_8, GS_API_LATEST) +- (BOOL)allowsMagnification; +- (void)setAllowsMagnification:(BOOL)m; +#endif /* Updating display after scrolling */ - (void)reflectScrolledClipView:(NSClipView*)aClipView; diff --git a/Source/NSScrollView.m b/Source/NSScrollView.m index 0144429f0..b8633cee1 100644 --- a/Source/NSScrollView.m +++ b/Source/NSScrollView.m @@ -1534,6 +1534,17 @@ GSOppositeEdge(NSRectEdge edge) return _vertScroller; } +- (BOOL)allowsMagnification +{ + //we need an ivar for this + return NO; +} + +- (void)setAllowsMagnification:(BOOL)m +{ + //we need an ivar for this +} + /* * NSCoding protocol */