@@ -72,54 +72,42 @@ typedef NSUInteger PGScrollToRectType;
72
72
NSUInteger _scrollCount;
73
73
}
74
74
75
- - (NSResponder <PGClipViewDelegate> *)delegate ;
76
- - (void )setDelegate : (NSResponder <PGClipViewDelegate> *)anObject ;
77
-
78
- - (NSView *)documentView ;
79
- - (void )setDocumentView : (NSView *)aView ;
80
- - (NSRect )documentFrame ;
81
- - (PGInset)boundsInset ;
82
- - (void )setBoundsInset : (PGInset)inset ;
83
- - (NSRect )insetBounds ;
84
-
85
- - (NSColor *)backgroundColor ;
86
- - (void )setBackgroundColor : (NSColor *)aColor ;
87
- - (BOOL )showsBorder ;
88
- - (void )setShowsBorder : (BOOL )flag ;
89
- - (NSCursor *)cursor ;
90
- - (void )setCursor : (NSCursor *)cursor ;
75
+ @property (assign ) NSResponder <PGClipViewDelegate> *delegate;
76
+ @property (retain ) NSView *documentView;
77
+ @property (readonly ) NSRect documentFrame;
78
+ @property (assign ) PGInset boundsInset;
79
+ @property (readonly ) NSRect insetBounds;
80
+ @property (retain ) NSColor *backgroundColor;
81
+ @property (assign ) BOOL showsBorder;
82
+ @property (retain ) NSCursor *cursor;
83
+ @property (assign , getter = isScrolling) BOOL scrolling;
84
+ @property (assign ) PGRectEdgeMask pinLocation;
85
+
86
+ @property (readonly ) NSPoint position;
87
+ @property (readonly ) NSPoint center;
88
+ @property (readonly ) NSPoint relativeCenter;
89
+ @property (readonly ) NSSize pinLocationOffset;
91
90
92
- - (NSRect )scrollableRectWithBorder : (BOOL )flag ;
93
- - (NSSize )distanceInDirection : (PGRectEdgeMask)direction forScrollType : (PGScrollType)scrollType ;
94
- - (NSSize )distanceInDirection : (PGRectEdgeMask)direction forScrollType : (PGScrollType)scrollType fromPosition : (NSPoint )position ;
95
- - (NSSize )maximumDistanceForScrollType : (PGScrollType)scrollType ;
96
- - (BOOL )shouldExitForMovementInDirection : (PGRectEdgeMask)mask ;
97
-
98
- - (NSPoint )position ;
99
91
- (BOOL )scrollTo : (NSPoint )aPoint animation : (PGAnimationType)type ;
100
92
- (BOOL )scrollBy : (NSSize )aSize animation : (PGAnimationType)type ;
101
93
- (BOOL )scrollToEdge : (PGRectEdgeMask)mask animation : (PGAnimationType)type ;
102
94
- (BOOL )scrollToLocation : (PGPageLocation)location animation : (PGAnimationType)type ;
103
- - (void )stopAnimatedScrolling ;
104
-
105
- - (PGRectEdgeMask)pinLocation ;
106
- - (void )setPinLocation : (PGRectEdgeMask)mask ;
107
- - (NSSize )pinLocationOffset ;
108
- - (BOOL )scrollPinLocationToOffset : (NSSize )aSize ;
109
-
110
- - (NSPoint )center ;
111
95
- (BOOL )scrollCenterTo : (NSPoint )aPoint animation : (PGAnimationType)type ;
112
- - (NSPoint )relativeCenter ;
113
96
- (BOOL )scrollRelativeCenterTo : (NSPoint )aPoint animation : (PGAnimationType)type ;
97
+ - (BOOL )scrollPinLocationToOffset : (NSSize )aSize animation : (PGAnimationType)type ;
98
+ - (void )stopAnimatedScrolling ;
99
+
100
+ - (NSRect )scrollableRectWithBorder : (BOOL )flag ;
101
+ - (NSSize )distanceInDirection : (PGRectEdgeMask)direction forScrollType : (PGScrollType)scrollType ;
102
+ - (NSSize )distanceInDirection : (PGRectEdgeMask)direction forScrollType : (PGScrollType)scrollType fromPosition : (NSPoint )position ;
103
+ - (NSSize )maximumDistanceForScrollType : (PGScrollType)scrollType ;
104
+ - (BOOL )shouldExitForMovementInDirection : (PGRectEdgeMask)mask ;
114
105
115
106
- (BOOL )handleMouseDown : (NSEvent *)firstEvent ;
116
107
- (void )arrowKeyDown : (NSEvent *)firstEvent ;
117
108
- (void )scrollInDirection : (PGRectEdgeMask)direction type : (PGScrollType)scrollType ;
118
109
- (void )magicPanForward : (BOOL )forward acrossFirst : (BOOL )across ;
119
110
120
- - (void )beginScrolling ;
121
- - (void )endScrolling ;
122
-
123
111
- (void )viewFrameDidChange : (NSNotification *)aNotif ;
124
112
125
113
@end
@@ -137,10 +125,10 @@ typedef NSUInteger PGScrollToRectType;
137
125
138
126
@end
139
127
140
- @interface NSObject (PGClipViewAdditions)
128
+ @interface NSView (PGClipViewAdditions)
141
129
142
- - ( PGClipView *) PG_enclosingClipView ;
143
- - ( PGClipView *) PG_clipView ;
130
+ @property ( readonly ) PGClipView *PG_enclosingClipView;
131
+ @property ( readonly ) PGClipView *PG_clipView;
144
132
145
133
- (void )PG_scrollRectToVisible : (NSRect )aRect type : (PGScrollToRectType)type ;
146
134
- (void )PG_scrollRectToVisible : (NSRect )aRect forView : (NSView *)view type : (PGScrollToRectType)type ;
0 commit comments