diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-29 19:33:55 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-29 19:33:55 (GMT) |
| commit | 405efb77f1e112a07406b05b1dfca6b8622cc9c9 (patch) | |
| tree | c8326377193f041b92aa0cb98a6291c79ec88d7e /macosx/tkMacOSXMouseEvent.c | |
| parent | 68fc0a0ef4781d53802b28f569935acedc875a92 (diff) | |
| parent | b4c4a98400bc483fdc35555c62cb4de6d2814bdf (diff) | |
| download | tk-405efb77f1e112a07406b05b1dfca6b8622cc9c9.zip tk-405efb77f1e112a07406b05b1dfca6b8622cc9c9.tar.gz tk-405efb77f1e112a07406b05b1dfca6b8622cc9c9.tar.bz2 | |
Merge trunk
Diffstat (limited to 'macosx/tkMacOSXMouseEvent.c')
| -rw-r--r-- | macosx/tkMacOSXMouseEvent.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c index 92d2daf..17aaa0f 100644 --- a/macosx/tkMacOSXMouseEvent.c +++ b/macosx/tkMacOSXMouseEvent.c @@ -93,7 +93,7 @@ enum { if (eventWindow) { local = [theEvent locationInWindow]; global = [eventWindow tkConvertPointToScreen: local]; - tkwin = TkMacOSXGetCapture(); + tkwin = TkpGetCapture(); if (tkwin) { winPtr = (TkWindow *) tkwin; eventWindow = TkMacOSXDrawableWindow(winPtr->window); @@ -112,7 +112,7 @@ enum { */ global = [theEvent locationInWindow]; - tkwin = TkMacOSXGetCapture(); + tkwin = TkpGetCapture(); if (tkwin) { winPtr = (TkWindow *) tkwin; eventWindow = TkMacOSXDrawableWindow(winPtr->window); @@ -609,7 +609,7 @@ GenerateButtonEvent( if ((medPtr->activeNonFloating == NULL) || ((!(TkpIsWindowFloating(medPtr->whichWin)) && (medPtr->activeNonFloating != medPtr->whichWin)) - && TkMacOSXGetCapture() == NULL)) { + && TkpGetCapture() == NULL)) { return false; } #endif @@ -688,7 +688,7 @@ TkpSetCapture( /* *---------------------------------------------------------------------- * - * TkMacOSXGetCapture -- + * TkpGetCapture -- * * Results: * Returns the current grab window @@ -700,7 +700,7 @@ TkpSetCapture( */ Tk_Window -TkMacOSXGetCapture(void) +TkpGetCapture(void) { return captureWinPtr; } |