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/tkMacOSXSubwindows.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/tkMacOSXSubwindows.c')
| -rw-r--r-- | macosx/tkMacOSXSubwindows.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c index a38907d..d536a1b 100644 --- a/macosx/tkMacOSXSubwindows.c +++ b/macosx/tkMacOSXSubwindows.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.2.2.12 2006/07/24 04:45:26 das Exp $ + * RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.2.2.13 2006/10/31 22:33:38 das Exp $ */ #include "tkMacOSXInt.h" @@ -895,8 +895,8 @@ TkMacOSXUpdateClipRgn( TkMacOSXUpdateClipRgn(contWinPtr); SectRgn(rgn, contWinPtr->privatePtr->aboveClipRgn, rgn); - } else if (gMacEmbedHandler != NULL) { - gMacEmbedHandler->getClipProc((Tk_Window) winPtr, tmpRgn); + } else if (tkMacOSXEmbedHandler != NULL) { + tkMacOSXEmbedHandler->getClipProc((Tk_Window) winPtr, tmpRgn); SectRgn(rgn, tmpRgn, rgn); } @@ -1126,8 +1126,8 @@ TkMacOSXGetDrawablePort( if (contWinPtr != NULL) { resultPort = TkMacOSXGetDrawablePort( (Drawable) contWinPtr->privatePtr); - } else if (gMacEmbedHandler != NULL) { - resultPort = gMacEmbedHandler->getPortProc( + } else if (tkMacOSXEmbedHandler != NULL) { + resultPort = tkMacOSXEmbedHandler->getPortProc( (Tk_Window) macWin->winPtr); } @@ -1191,7 +1191,7 @@ TkMacOSXGetRootControl( if (contWinPtr != NULL) { result = TkMacOSXGetRootControl( (Drawable) contWinPtr->privatePtr); - } else if (gMacEmbedHandler != NULL) { + } else if (tkMacOSXEmbedHandler != NULL) { result = NULL; } } |