diff options
| author | das <das> | 2006-04-28 06:02:57 (GMT) |
|---|---|---|
| committer | das <das> | 2006-04-28 06:02:57 (GMT) |
| commit | 9ceb3384e07c73f8b2cc134e436fdad814278f8e (patch) | |
| tree | 5b3992c68a12ca95ff81a211d111286d7c82c2e0 /macosx/tkMacOSXScrlbr.c | |
| parent | 62375927490226ffd242b8cf5f35cc6aa218ddb6 (diff) | |
| download | tk-9ceb3384e07c73f8b2cc134e436fdad814278f8e.zip tk-9ceb3384e07c73f8b2cc134e436fdad814278f8e.tar.gz tk-9ceb3384e07c73f8b2cc134e436fdad814278f8e.tar.bz2 | |
* macosx/tkMacOSXWm.c (TkWmMapWindow, InitialWindowBounds): fix use of
potentially stale window position in initial configure event on first
map of a window. [Bug 1476443]
(TkMacOSXWindowOffset): use modern GetWindowStructureWidths API.
* macosx/tkMacOSXInt.h:
* macosx/tkMacOSXMouseEvent.c (TkGenerateButtonEventForXPointer): new
internal function to generate button events for current pointer
directly, without requiring prior call to XQueryPointer().
* macosx/tkMacOSXMouseEvent.c (XQueryPointer): implement return of
window-local pointer position.
* macosx/tkMacOSXInt.h: use improvements above to avoid calls to
* macosx/tkMacOSXKeyEvent.c: GlobalToLocal() when the current port might
* macosx/tkMacOSXMenu.c: not be set correctly. May fix [Bug 1243318]
* macosx/tkMacOSXMenus.c:
* macosx/tkMacOSXScale.c:
* macosx/tkMacOSXScrlbr.c:
* tkAboutDlg.r: update copyright.
* macosx/tkMacOSXCarbonEvents.c: sync with HEAD
* macosx/tkMacOSXDebug.c:
* macosx/tkMacOSXDebug.h:
* macosx/tkMacOSXDraw.c:
* macosx/tkMacOSXEvent.c:
* macosx/tkMacOSXEvent.h:
* macosx/tkMacOSXFont.h:
* macosx/tkMacOSXInit.c:
* macosx/tkMacOSXInt.h:
* macosx/tkMacOSXKeyEvent.c:
* macosx/tkMacOSXMenu.c:
* macosx/tkMacOSXMenubutton.c:
* macosx/tkMacOSXMouseEvent.c:
* macosx/tkMacOSXSend.c:
* macosx/tkMacOSXTest.c:
* macosx/tkMacOSXWindowEvent.c:
* macosx/tkMacOSXWm.c:
Diffstat (limited to 'macosx/tkMacOSXScrlbr.c')
| -rw-r--r-- | macosx/tkMacOSXScrlbr.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c index ec7bed7..0fd3ffa 100644 --- a/macosx/tkMacOSXScrlbr.c +++ b/macosx/tkMacOSXScrlbr.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.5.2.8 2006/03/28 02:44:14 das Exp $ + * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.5.2.9 2006/04/28 06:03:00 das Exp $ */ #include "tkMacOSXInt.h" @@ -790,8 +790,7 @@ ScrollbarBindProc( if (eventPtr->type == ButtonPress) { Point where; Rect bounds; - int part, x, y, dummy; - unsigned int state; + int part; CGrafPtr saveWorld; GDHandle saveDevice; GWorldPtr destPort; @@ -876,10 +875,8 @@ ScrollbarBindProc( * The TrackControl call will "eat" the ButtonUp event. We now * generate a ButtonUp event so Tk will unset implicit grabs etc. */ - XQueryPointer(NULL, None, &window, &window, &x, - &y, &dummy, &dummy, &state); window = Tk_WindowId(scrollPtr->tkwin); - TkGenerateButtonEvent(x, y, window, state); + TkGenerateButtonEventForXPointer(window); SetGWorld(saveWorld, saveDevice); } |