summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macosx/tkMacOSXCarbonEvents.c10
-rw-r--r--macosx/tkMacOSXMenu.c4
2 files changed, 7 insertions, 7 deletions
diff --git a/macosx/tkMacOSXCarbonEvents.c b/macosx/tkMacOSXCarbonEvents.c
index d903636..6a8b5c7 100644
--- a/macosx/tkMacOSXCarbonEvents.c
+++ b/macosx/tkMacOSXCarbonEvents.c
@@ -60,7 +60,7 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXCarbonEvents.c,v 1.3.2.9 2006/01/10 05:38:20 das Exp $
+ * RCS: @(#) $Id: tkMacOSXCarbonEvents.c,v 1.3.2.10 2006/01/11 05:57:41 das Exp $
*/
#include "tkInt.h"
@@ -119,7 +119,7 @@ CarbonEventHandlerProc (
macEvent.interp = (Tcl_Interp *) userData;
bzero(&eventStatus, sizeof(eventStatus));
-#ifdef TK_MAC_DEBUG_CARBON_EVENTS
+#if defined(TK_MAC_DEBUG) && defined(TK_MAC_DEBUG_CARBON_EVENTS)
char buf [256];
if (macEvent.eKind != kEventMouseMoved &&
macEvent.eKind != kEventMouseDragged) {
@@ -139,7 +139,7 @@ CarbonEventHandlerProc (
result = noErr;
}
-#ifdef TK_MAC_DEBUG_CARBON_EVENTS
+#if defined(TK_MAC_DEBUG) && defined(TK_MAC_DEBUG_CARBON_EVENTS)
if (macEvent.eKind != kEventMouseMoved &&
macEvent.eKind != kEventMouseDragged) {
fprintf(stderr,
@@ -225,7 +225,7 @@ TkMacOSXInitCarbonEvents (
#endif
}
-#ifdef TK_MAC_DEBUG_CARBON_EVENTS
+#if defined(TK_MAC_DEBUG) && defined(TK_MAC_DEBUG_CARBON_EVENTS)
TkMacOSXInitNamedDebugSymbol(HIToolbox, void, TraceEventByName, char*);
if (TraceEventByName) {
/* Carbon-internal event debugging (c.f. Technote 2124) */
@@ -380,7 +380,7 @@ CarbonTimerProc (
{
while(carbonTimerEnabled && Tcl_DoOneEvent(
TCL_FILE_EVENTS|TCL_TIMER_EVENTS|TCL_DONT_WAIT)) {
-#ifdef TK_MAC_DEBUG_CARBON_EVENTS
+#if defined(TK_MAC_DEBUG) && defined(TK_MAC_DEBUG_CARBON_EVENTS)
fprintf(stderr, "Processed tcl event from carbon timer\n");
#endif /* TK_MAC_DEBUG_CARBON_EVENTS */
}
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 797e7ab..a35b00b 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.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: tkMacOSXMenu.c,v 1.6.2.15 2006/01/10 05:38:20 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.6.2.16 2006/01/11 05:57:41 das Exp $
*/
#include "tkMacOSXInt.h"
#include "tkMenubutton.h"
@@ -1072,7 +1072,7 @@ ReconfigureIndividualMenu(
TkMenuEntry *mePtr;
int parentDisabled = 0;
-#ifdef TK_MAC_DEBUG_MENUS
+#if defined(TK_MAC_DEBUG) && defined(TK_MAC_DEBUG_MENUS)
/* Carbon-internal menu debugging (c.f. Technote 2124) */
TkMacOSXInitNamedDebugSymbol(HIToolbox, void, DebugPrintMenu, MenuRef menu);
if (DebugPrintMenu) {