diff options
| author | das <das> | 2006-10-31 22:33:38 (GMT) |
|---|---|---|
| committer | das <das> | 2006-10-31 22:33:38 (GMT) |
| commit | 186128bc03cce2f6497a753f1940227187dcc4aa (patch) | |
| tree | e3d83a3269a13bfac631d4287ef7adee4286d144 /macosx/tkMacOSXWm.c | |
| parent | ee8611570c943c62dfe364654e24eabc99428e93 (diff) | |
| download | tk-186128bc03cce2f6497a753f1940227187dcc4aa.zip tk-186128bc03cce2f6497a753f1940227187dcc4aa.tar.gz tk-186128bc03cce2f6497a753f1940227187dcc4aa.tar.bz2 | |
* macosx/tkMacOSXDebug.c: add TkMacOSX prefix to leftover macosx-private
* macosx/tkMacOSXDebug.h: global symbols without Tk prefix; ifdef out
* macosx/tkMacOSXEmbed.c: currently unused debug procs.
* macosx/tkMacOSXEvent.c:
* macosx/tkMacOSXInt.h:
* macosx/tkMacOSXCarbonEvents.c:
* macosx/tkMacOSXSubwindows.c:
* macosx/tkMacOSXWm.c:
Diffstat (limited to 'macosx/tkMacOSXWm.c')
| -rw-r--r-- | macosx/tkMacOSXWm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index 16f9da9..d8815bc 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXWm.c,v 1.7.2.34 2006/09/11 16:12:58 das Exp $ + * RCS: @(#) $Id: tkMacOSXWm.c,v 1.7.2.35 2006/10/31 22:33:38 das Exp $ */ #include "tkMacOSXInt.h" @@ -3644,7 +3644,7 @@ Tk_GetRootCoords( } else { Point theOffset; - if (gMacEmbedHandler->getOffsetProc != NULL) { + if (tkMacOSXEmbedHandler->getOffsetProc != NULL) { /* * We do not require that the changes.x & changes.y for * a non-Tk master window be kept up to date. So we @@ -3657,7 +3657,7 @@ Tk_GetRootCoords( x -= winPtr->changes.x + winPtr->changes.border_width; y -= winPtr->changes.y + winPtr->changes.border_width; - gMacEmbedHandler->getOffsetProc((Tk_Window) winPtr, &theOffset); + tkMacOSXEmbedHandler->getOffsetProc((Tk_Window) winPtr, &theOffset); x += theOffset.h; y += theOffset.v; @@ -5124,9 +5124,9 @@ TkMacOSXMakeRealWindowExist( TkMacOSXMakeRealWindowExist(contWinPtr->privatePtr->toplevel->winPtr); macWin->flags |= TK_HOST_EXISTS; return; - } else if (gMacEmbedHandler != NULL) { - if (gMacEmbedHandler->containerExistProc != NULL) { - if (gMacEmbedHandler->containerExistProc((Tk_Window) winPtr) != TCL_OK) { + } else if (tkMacOSXEmbedHandler != NULL) { + if (tkMacOSXEmbedHandler->containerExistProc != NULL) { + if (tkMacOSXEmbedHandler->containerExistProc((Tk_Window) winPtr) != TCL_OK) { Tcl_Panic("ContainerExistProc could not make container"); } } |