diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-02 14:09:23 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-02 14:09:23 (GMT) |
| commit | b19d4dada534a8bd99260351c5e6d8252f80019d (patch) | |
| tree | 150d0e8062306cfbdb40684b76ad9067ef291cc7 /macosx/tkMacOSXScrlbr.c | |
| parent | d8bc430e7ea96f8e935ddcc710b9891d10eaf234 (diff) | |
| parent | 066d6dcb874a4f9bae3ba8f4d8fd54e460413e88 (diff) | |
| download | tk-b19d4dada534a8bd99260351c5e6d8252f80019d.zip tk-b19d4dada534a8bd99260351c5e6d8252f80019d.tar.gz tk-b19d4dada534a8bd99260351c5e6d8252f80019d.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'macosx/tkMacOSXScrlbr.c')
| -rw-r--r-- | macosx/tkMacOSXScrlbr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c index 8338f0e..8483cbb 100644 --- a/macosx/tkMacOSXScrlbr.c +++ b/macosx/tkMacOSXScrlbr.c @@ -174,8 +174,8 @@ static void drawMacScrollbar( MacScrollbar *msPtr, CGContextRef context) { - Drawable d = (Drawable)Tk_WindowId(scrollPtr->tkwin); - NSView *view = TkMacOSXDrawableView(d); + Drawable d = Tk_WindowId(scrollPtr->tkwin); + NSView *view = TkMacOSXGetNSViewForDrawable(d); CGPathRef path; CGPoint inner[2], outer[2], thumbOrigin; CGSize thumbSize; @@ -258,8 +258,8 @@ TkpDisplayScrollbar( return; } - MacDrawable *macWin = (MacDrawable *) winPtr->window; - NSView *view = TkMacOSXDrawableView(macWin); + MacDrawable *macWin = (MacDrawable *)winPtr->window; + NSView *view = TkMacOSXGetNSViewForDrawable(macWin); if ((view == NULL) || (macWin->flags & TK_DO_NOT_DRAW) @@ -590,12 +590,12 @@ UpdateControlValues( { MacScrollbar *msPtr = (MacScrollbar *) scrollPtr; Tk_Window tkwin = scrollPtr->tkwin; - MacDrawable *macWin = (MacDrawable *) Tk_WindowId(scrollPtr->tkwin); + MacDrawable *macWin = (MacDrawable *)Tk_WindowId(scrollPtr->tkwin); double dViewSize; HIRect contrlRect; short width, height; - NSView *view = TkMacOSXDrawableView(macWin); + NSView *view = TkMacOSXGetNSViewForDrawable(macWin); CGFloat viewHeight = [view bounds].size.height; NSRect frame; |