diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2014-11-20 02:34:09 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2014-11-20 02:34:09 (GMT) |
| commit | 02b543ede36c5f387093c576a915c0788628bedb (patch) | |
| tree | 5a101e668abf73d28f52221e94951ca6a824c959 /macosx/tkMacOSXScrlbr.c | |
| parent | 0e22d8ae3dcf3f15ae9df9bab55581868f8dbf5a (diff) | |
| download | tk-02b543ede36c5f387093c576a915c0788628bedb.zip tk-02b543ede36c5f387093c576a915c0788628bedb.tar.gz tk-02b543ede36c5f387093c576a915c0788628bedb.tar.bz2 | |
Back out changes not pertaining to private API; those files should not have been updated.
Diffstat (limited to 'macosx/tkMacOSXScrlbr.c')
| -rw-r--r-- | macosx/tkMacOSXScrlbr.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c index 00f6088..f9a2f5f 100644 --- a/macosx/tkMacOSXScrlbr.c +++ b/macosx/tkMacOSXScrlbr.c @@ -1,5 +1,5 @@ /* - * tkMacOSXScrollbar.c -- + * tkMacOSXScrollbar.c -- * * This file implements the Macintosh specific portion of the scrollbar * widget. @@ -50,15 +50,11 @@ NSRect TkMacOSXGetScrollFrame(TkScrollbar *scrlPtr); NSRect Tkframe = TkMacOSXGetScrollFrame(scrollPtr); /* Do not draw if the widget is misplaced or unmapped. */ if ( NSIsEmptyRect(Tkframe) || - ! (macWin->winPtr->flags & TK_MAPPED) + ! macWin->winPtr->flags & TK_MAPPED || + ! NSEqualRects(Tkframe, [self frame]) ) { return; } - for (Tk_Window parent_win = tkwin; parent_win != NULL;parent_win = Tk_Parent(parent_win)) { - if (!Tk_IsMapped(parent_win)) { - return; - } - } /* * Do not draw if the widget is completely outside of its parent. |