diff options
| author | stanton <stanton> | 1999-04-16 01:51:06 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1999-04-16 01:51:06 (GMT) |
| commit | 03656f44f81469f459031fa3a4a7b09c8bc77712 (patch) | |
| tree | 31378e81bd58f8c726fc552d6b30cbf3ca07497b /mac/tkMacMenus.c | |
| parent | 404fc236f34304df53b7e44bc7971d786b87d453 (diff) | |
| download | tk-03656f44f81469f459031fa3a4a7b09c8bc77712.zip tk-03656f44f81469f459031fa3a4a7b09c8bc77712.tar.gz tk-03656f44f81469f459031fa3a4a7b09c8bc77712.tar.bz2 | |
* Merged 8.1 branch into the main trunk
Diffstat (limited to 'mac/tkMacMenus.c')
| -rw-r--r-- | mac/tkMacMenus.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mac/tkMacMenus.c b/mac/tkMacMenus.c index 7e95391..b624e63f5 100644 --- a/mac/tkMacMenus.c +++ b/mac/tkMacMenus.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacMenus.c,v 1.2 1998/09/14 18:23:38 stanton Exp $ + * RCS: @(#) $Id: tkMacMenus.c,v 1.3 1999/04/16 01:51:31 stanton Exp $ */ #include "tcl.h" @@ -80,6 +80,7 @@ TkMacHandleMenuSelect( Str255 name; Tk_Window tkwin; Window window; + TkDisplay *dispPtr; if (mResult == 0) { TkMacHandleTearoffMenu(); @@ -120,7 +121,8 @@ TkMacHandleMenuSelect( case kCloseItem: /* Send close event */ window = TkMacGetXWindow(FrontWindow()); - tkwin = Tk_IdToWindow(tkDisplayList->display, window); + dispPtr = TkGetDisplayList(); + tkwin = Tk_IdToWindow(dispPtr->display, window); TkGenWMDestroyEvent(tkwin); break; case kQuitItem: @@ -251,9 +253,11 @@ GenerateEditEvent( Point where; Tk_Window tkwin; Window window; + TkDisplay *dispPtr; window = TkMacGetXWindow(FrontWindow()); - tkwin = Tk_IdToWindow(tkDisplayList->display, window); + dispPtr = TkGetDisplayList(); + tkwin = Tk_IdToWindow(dispPtr->display, window); tkwin = (Tk_Window) ((TkWindow *) tkwin)->dispPtr->focusPtr; if (tkwin == NULL) { return; |