summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXSubwindows.c
diff options
context:
space:
mode:
authordas <das>2006-10-31 22:33:33 (GMT)
committerdas <das>2006-10-31 22:33:33 (GMT)
commitbd738e27a3e574c532139870400319684120100c (patch)
tree91f1ad67cdcc39fef1befc69415787833a73b6e6 /macosx/tkMacOSXSubwindows.c
parent2f0a9d443ac48768f31536ed71c9e51d8636a68e (diff)
downloadtk-bd738e27a3e574c532139870400319684120100c.zip
tk-bd738e27a3e574c532139870400319684120100c.tar.gz
tk-bd738e27a3e574c532139870400319684120100c.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.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index e465ff9..a471e6f 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.15 2006/07/24 04:45:23 das Exp $
+ * RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.16 2006/10/31 22:33:34 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;
}
}