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/tkMacOSXEmbed.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/tkMacOSXEmbed.c')
| -rw-r--r-- | macosx/tkMacOSXEmbed.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c index 802a15c..b98ec45 100644 --- a/macosx/tkMacOSXEmbed.c +++ b/macosx/tkMacOSXEmbed.c @@ -14,7 +14,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXEmbed.c,v 1.2.2.3 2006/04/22 04:12:25 das Exp $ + * RCS: @(#) $Id: tkMacOSXEmbed.c,v 1.2.2.4 2006/10/31 22:33:38 das Exp $ */ #include "tkMacOSXInt.h" @@ -50,7 +50,7 @@ static Container *firstContainerPtr = NULL; * Globals defined in this file */ -TkMacOSXEmbedHandler *gMacEmbedHandler = NULL; +TkMacOSXEmbedHandler *tkMacOSXEmbedHandler = NULL; /* * Prototypes for static procedures defined in this file: @@ -98,14 +98,14 @@ Tk_MacOSXSetEmbedHandler( Tk_MacOSXEmbedGetClipProc *getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc) { - if (gMacEmbedHandler == NULL) { - gMacEmbedHandler = (TkMacOSXEmbedHandler *) ckalloc(sizeof(TkMacOSXEmbedHandler)); + if (tkMacOSXEmbedHandler == NULL) { + tkMacOSXEmbedHandler = (TkMacOSXEmbedHandler *) ckalloc(sizeof(TkMacOSXEmbedHandler)); } - gMacEmbedHandler->registerWinProc = registerWinProc; - gMacEmbedHandler->getPortProc = getPortProc; - gMacEmbedHandler->containerExistProc = containerExistProc; - gMacEmbedHandler->getClipProc = getClipProc; - gMacEmbedHandler->getOffsetProc = getOffsetProc; + tkMacOSXEmbedHandler->registerWinProc = registerWinProc; + tkMacOSXEmbedHandler->getPortProc = getPortProc; + tkMacOSXEmbedHandler->containerExistProc = containerExistProc; + tkMacOSXEmbedHandler->getClipProc = getClipProc; + tkMacOSXEmbedHandler->getOffsetProc = getOffsetProc; } @@ -336,8 +336,8 @@ TkpUseWindow( * see if it can handle this window... */ - if (gMacEmbedHandler == NULL || - gMacEmbedHandler->registerWinProc((int) parent, + if (tkMacOSXEmbedHandler == NULL || + tkMacOSXEmbedHandler->registerWinProc((int) parent, (Tk_Window) winPtr) != TCL_OK) { Tcl_AppendResult(interp, "The window ID ", string, " does not correspond to a valid Tk Window.", |