* macosx/tkMacOSXCarbonEvents.c: add window event target carbon event

	* macosx/tkMacOSXEvent.c:	 handler for all kEventClassWindow and
	* macosx/tkMacOSXEvent.h:	 kEventClassMouse events;
	* macosx/tkMacOSXNotify.c:	 move all remaining events except for
	* macosx/tkMacOSXWindowEvent.c:	 kEventClassKeyboard from dispatcher to
	application event handler; pass event handler callRef downstream; fix
	debug event tracing; process all tcl event types in carbon event timer;
	delay carbon event timer first fire; add TkMacOSXTrackingLoop() to mark
	enter/exit of event tracking loop during which all tcl events but only
	carbon update events should be processed by the timer (replaces various
	calls to Tcl_SetServiceMode()); rename TkMacOSXReceiveAndProcessEvent()
	to TkMacOSXReceiveAndDispatchEvent(), move it from tkMacOSXEvent.c to
	tkMacOSXCarbonEvents.c and modify it to dequeue only update events
	during a tracking loop; add TkMacOSXRunTclEventLoop() to standardize
	the various ways in use to run the tcl event loop; add handling of
	kEventClassAppearance events (for ScrollBarVariantChanged event).

	* macosx/tkMacOSXDialog.c:	use new TkMacOSXTrackingLoop() around
	* macosx/tkMacOSXEvent.c:	blocking API that puts up modal dialogs
	* macosx/tkMacOSXMenu.c:	or when entering/exiting menu/control
	* macosx/tkMacOSXMouseEvent.c:	tracking, window dragging and other
	* macosx/tkMacOSXScale.c:	mouse tracking loops.
	* macosx/tkMacOSXScrlbr.c:
	* macosx/tkMacOSXWindowEvent.c:
	* macosx/tkMacOSXWm.c:

	* macosx/tkMacOSXDialog.c:	use new TkMacOSXRunTclEventLoop()
	* macosx/tkMacOSXScale.c:	instead of Tcl_DoOneEvent(),
	* macosx/tkMacOSXScrlbr.c:	Tcl_ServiceAll(), TclServiceIdle()
	* macosx/tkMacOSXWindowEvent.c:	and Tcl_GlobalEval("update idletasks").

	* macosx/tkMacOSXColor.c: make available as Tk system colors all
	* macosx/tkMacOSXPort.h:  appearance manager brushes, text colors and
	backgrounds with new and legacy names, as well as the fully transparent
	color "systemTransparent"; add TkMacOSXSetColorIn{Port,Context}() to
	directly set an X pixel color value in the current QD port resp. the
	given CG context without requiring passage through rgb representation
	(lossy for most system colors); modernize/remove Classic-era code;
	replace crufty strcmp() elseifs by Tcl_GetIndexFromObjStruct().

	* macosx/tkMacOSXButton.c:	use new TkMacOSXSetColorInPort()
	* macosx/tkMacOSXDraw.c:	instead of setting rgb color directly
	* macosx/tkMacOSXMenubutton.c:	to allow for non-rgb system colors.

	* macosx/tkMacOSXCursor.c: implement "none" cursor as on other
	platforms [Patch 1615427]; add all missing appearance manager cursors.

	* macosx/tkMacOSXDefault.h: set SELECT_FG_COLORs to None to match aqua
	L&F; use standard system color names; use new 'menu' system font;
	correct default scrollbar width.

	* macosx/tkMacOSXDraw.c:	standardize initialization, use and
	* macosx/tkMacOSXInt.h:		emptying of various static temp rgns
	* macosx/tkMacOSXRegion.c:	onto two global RgnHandles; in debug
	* macosx/tkMacOSXSubwindows.c:	builds, verify emptiness of these temp
	* macosx/tkMacOSXWindowEvent.c:	rgns before use.

	* macosx/tkMacOSXDraw.c: add TkMacOSX{Setup,Restore}DrawingContext() to
	* macosx/tkMacOSXInt.h:  abstract common setup & teardown of drawing
	environment (for both CG and QD); save/restore QD theme drawing state;
	handle GC clip region; add TkpClipDrawableToRect() to allow clipped
	drawing into drawable regardless of GC used; use new system color
	"systemWindowHeaderBackground" to setup background in themed toplevels;
	correct implementation of TkMacOSXMakeStippleMap().

	* macosx/tkMacOSXEntry.c:  use new TkMacOSXSetupDrawingContext() and
	* macosx/tkMacOSXFont.c:   TkMacOSXRestoreDrawingContext() instead of
	* macosx/ttkMacOSXTheme.c: various setup/teardown procs like
	TkMacOSX{SetUp,Release}CGContext(), TkMacOSXQuarz{Start,End}Draw(),
	TkMacOSXSetUpGraphicsPort() etc.

	* macosx/tkMacOSXEmbed.c: add CG context and drawable clip rgn fields
	* macosx/tkMacOSXInt.h:   to MacDrawable struct.
	* macosx/tkMacOSXSubwindows.c:

	* macosx/tkMacOSXDialog.c: make -parent option of tk_getOpenFile et al.
	use the sheet version of NavServices dialogs; ensure native parent win
	exists before using StandardSheet API for tk_messageBox [Bug 1677611];
	force sheets to behave like app-modal dialogs via WindowModality() API;
	use more modern ColorPicker API.

	* macosx/tkAboutDlg.r: use themed movable modal dialog, fix (c) year.

	* macosx/tkMacOSXEntry.c:  take xOff/yOff of MacDrawable into account
	* macosx/ttkMacOSXTheme.c: when computing locations/bounds to ensure
	correct posititioning when not drawing into intermediate pixmap.

	* macosx/tkMacOSXFont.c: use appearance manager API to map system font
	* macosx/tkMacOSXFont.h: names to TkFonts; add "menu" system font for
	menu item text drawing from MDEF; always draw with CG; remove QD
	dependent stippling algorithm; move most header declarations into the
	source file (as they were not used anywhere else).

	* macosx/tkMacOSXMenu.c:		 large-scale rewrite of custom
	* macosx/tkMacOSXMenu.r (removed):	 MDEF and related code that
	* macosx/Wish.xcode/project.pbxproj:	 restores many longtime-MIA
	* macosx/Wish.xcodeproj/project.pbxproj: features to working order
	* unix/Makefile.in:			 (e.g. images, custom colors &
	fonts in menus etc); implement compound menu items; use Appearance Mgr
	and ThemeText APIs to mimic native MDEF as closely as possible when
	default "menu" system font is used; remove now obsolete SICN drawing
	code and resources.

	* macosx/tkMacOSXCarbonEvents.c: handle additional menu carbon events
	* macosx/tkMacOSXEvent.c:	 in order to support <<MenuSelect>> in
	* macosx/tkMacOSXMenu.c:	 the menubar and in menus that are not
	* macosx/tkMacOSXMenus.c:	 using the custom MDEF [Bug 1620826];
	fix early and missing clearing of current Tk active menu entry; fix
	extraneous sending of <<MenuSelect>> during active menu entry clearing.

	* macosx/tkMacOSXMouseEvent.c: add support for async window dragging by
	the window server; set the corresponding window attribute by default.

	* macosx/tkMacOSXMouseEvent.c: rationalized handling order of
	non-mousedown events; add TkMacOSXModifierState() to retrieve the
	current key modifiers in carbon format.

	* macosx/tkMacOSXScrlbr.c: use appearance manager API to retrieve
	scrollbar component metrics; add awareness of multiple possibilites for
	scrollbar arrow position in aqua and handle user changes to arrow
	position pref; handle difference in metrics of small & large scrollbar
	variants; handle aqua "jump to here" scrollbar behaviour; correct
	computation of scroll view size and position; enforce min scrollbar
	height to avoid scrollbar component overlap; erase scrollbar area
	outside of standard width; remove broken auto-adjust code; account for
	window class when leaving space for grow box; remove code to manually
	draw grow box; use modern API for thumb scroll proc; replace
	HiliteControl() by modern API; replace control mgr constants with
	appearance mgr equivalents.

	* macosx/tkMacOSXSubwindows.c: use SetWindowBounds() API instead of
	SizeWindow(); invalidate clip regions after X{Map,Unmap}Window as fix
	for [Bug 940117] made them dependent on mapping state; remove unneeded
	calls to TkMacOSXInvalClipRgns() and unnecessary setting of QD port;
	use native-endian pixmap on intel; remove obsolete pixmap pix locking.

	* macosx/tkMacOSXWindowEvent.c: handle only the first of a batch of
	kEventAppAvailableWindowBoundsChanged events sent per transaction;
	handle kEventWindowBoundsChanged event to support live window resizing
	and centralized sending of location/size changed ConfigureNotify
	events; ensure HIGrowBox is redrawn after bounds change; constrain
	window after dragging to ensure titlebar is not inacessible
	offscreen or under dock/menubar; handle kEventWindowGetRegion and
	kEventWindowDrawContent for transparent windows to mark resp. paint
	content region as transparent; handle kEventWindowConstrain for
	fullscreen windows to ensure bounds match new screen size; enter/exit
	fullscreen UIMode upon activation/deactivation of fullscreen window.

	* macosx/tkMacOSXWm.c: use live-resize and async-drag carbon window
	* macosx/tkMacOSXWm.h: attributes for toplevels by default; implement
	new [wm attributes] -topmost, -transparent and -fullscreen; refactor
	WmAttributesCmd() parallelling the tkUnixWm.c implementation, use thus
	factored proc to set proxy icon from [wm iconbitmap]; dynamically
	determine default values for toplevel min and max sizes (similar to
	tkWinWm.c impl): min sizes depend on window class & attributes to
	ensure visibility of all titlebar widgets and grow box, max sizes
	depend on maximal window bounds for all active displays; factor out
	code that puts into effect changes to master or override_redirect; use
	RepositionWindow() API to determine staggered initial window bounds;
	correct resize limit calculations, handle gridding and use modern
	resize API in TkMacOSXGrowToplevel(); remove sending of ConfigureNotify
	after resize or zoom (now handled by BoundsChanged handler); correct
	composite carbon window attribute handling, remove currently unusable
	attributes and add new attributes in [tk::unsupported::MacWindowStyle];
	ensure validity of window class and attributes before use; apply
	changes to window class when handling carbon window attribute changes
	(if HIWindowChangeClass() API available); add debug build warning
	message when deprecated window style is used instead of window class;
	use transparent HIGrowBox for resizable windows; avoid unnecessary
	calls to window structure width API; use tcl time API in TkpGetMS();
	add TkMacOSXEnterExitFullscreen() to enter/exit UIMode with dock and
	menubar hidden; restrict wmTracing output to debug builds; remove
	unneeded calls to TkMacOSXInvalClipRgns() and unnecessary setting of QD
	port; workaround GetWindowStructureWidths() Carbon bug (bogus results
	for never-mapped floating windows).

	* macosx/tkMacOSXXStubs.c (TkMacOSXDisplayChanged): add maximal window
	bounds field to Screen record (in ext_data), computed as the union of
	available window positioning bounds of all graphics devices (displays).

	* macosx/tkMacOSXBitmap.c: fix macRoman encoding leak.
	* macosx/tkMacOSXCursor.c:

	* macosx/tkMacOSXDebug.c (TkMacOSXCarbonEventToAscii): use static
	* macosx/tkMacOSXDebug.h: buffer to simplify callers; const fixes.

	* macosx/tkMacOSXBitmap.c: use more efficient QDSwapPort() instead of
	* macosx/tkMacOSXButton.c: GetPort()/SetPort()/GetGWorld()/SetGWorld().
	* macosx/tkMacOSXDraw.c:
	* macosx/tkMacOSXMenubutton.c:
	* macosx/tkMacOSXScale.c:
	* macosx/tkMacOSXScrlbr.c:
	* macosx/tkMacOSXXStubs.c:

	* macosx/tkMacOSXColor.c: use kHIToolboxVersionNumber for runtime OS
	* macosx/tkMacOSXEntry.c: version check rather than Gestalt() etc.
	* macosx/tkMacOSXInt.h:
	* macosx/tkMacOSXWm.c:

	* macosx/tkMacOSXDraw.c: remove obsolete and now incorrect
	* macosx/tkMacOSXInt.h:  tkMenuCascadeRgn clipping code.
	* macosx/tkMacOSXMenu.c:

	* macosx/tkMacOSXHLEvents.c: replace Tcl_GlobalEval() resp. Tcl_Eval()
	* macosx/tkMacOSXScrlbr.c:   by Tcl_EvalEx().
	* macosx/tkMacOSXInit.c:

	* macosx/tkMacOSXInit.c (TkpInit): reorder initialization steps.

	* macosx/tkMacOSXKeyEvent.c: remove pre-10.2 support.

	* macosx/tkMacOSXMenus.c: remove now useless call to
	TkMacOSXHandleTearoffMenu(); use \x.. quoting for non-latin1 macroman
	literar chars to allow file to be edited as utf-8.

	* macosx/tkMacOSXScale.c: replace TrackControl() by modern
	* macosx/tkMacOSXScrlbr.c: HandleControlClick() API (using new
	TkMacOSXModifierState()).

	* macosx/tkMacOSXInt.h:		move all constant #defines needed to
	* macosx/tkMacOSXColor.c:	support building on older OS X releases
	* macosx/tkMacOSXEvent.h:	to a central location in tkMacOSXInt.h.
	* macosx/tkMacOSXFont.c:
	* macosx/tkMacOSXMenu.c:
	* macosx/tkMacOSXMenubutton.c:
	* macosx/tkMacOSXMenus.c:
	* macosx/tkMacOSXMouseEvent.c:
	* macosx/tkMacOSXWm.c:
	* macosx/ttkMacOSXTheme.c:

	* macosx/tkMacOSXInt.h:		 add ChkErr() macro to factor out
	* macosx/tkMacOSXButton.c:	 Carbon OSStatus return value checking
	* macosx/tkMacOSXCarbonEvents.c: and TkMacOSXDbgMsg() macro to factour
	* macosx/tkMacOSXClipboard.c:	 out debug message output; use these
	* macosx/tkMacOSXColor.c:	 macros to replace #ifdef TK_MAC_DEBUG
	* macosx/tkMacOSXCursor.c:	 blocks & direct printing to stderr,
	* macosx/tkMacOSXDebug.c:	 and to do additional OSStatus return
	* macosx/tkMacOSXDialog.c:	 checking, and to standardize OSStatus
	* macosx/tkMacOSXDraw.c:	 usage.
	* macosx/tkMacOSXEntry.c:
	* macosx/tkMacOSXEvent.c:
	* macosx/tkMacOSXFont.c:
	* macosx/tkMacOSXHLEvents.c:
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXKeyEvent.c:
	* macosx/tkMacOSXMenu.c:
	* macosx/tkMacOSXMenubutton.c:
	* macosx/tkMacOSXMenus.c:
	* macosx/tkMacOSXMouseEvent.c:
	* macosx/tkMacOSXScrlbr.c:
	* macosx/tkMacOSXSubwindows.c:
	* macosx/tkMacOSXWindowEvent.c:
	* macosx/tkMacOSXWm.c:
	* macosx/tkMacOSXXStubs.c:

	* macosx/tkMacOSXSend.c:	remove duplicate/unused declarations
	* macosx/tkMacOSXXStubs.c:

	* macosx/tkMacOSXDebug.c:	const fixes.
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXTest.c:
	* macosx/tkMacOSXWm.c:
	* macosx/tkMacOSXXStubs.c:

	* macosx/Wish-Info.plist.in: add tcl document extensions/mime types and
	LSMinimumSystemVersion, LSRequiresCarbon & NSAppleScriptEnabled keys.

	* macosx/Wish-Common.xcconfig: add Wish's Info.plist as __info_plist
	section to tktest; enable more warnings.

	* macosx/Wish.xcodeproj/project.pbxproj: add 'DebugMemCompile' build
	configuration that calls configure with --enable-symbols=all; disable
	configure check for __attribute__((__visibility__("hidden"))) in Debug
	configuration to restore availability of ZeroLink.

	* macosx/Wish-Common.xcconfig:	fix whitespace.
	* macosx/Wish-Debug.xcconfig:
	* macosx/Wish-Release.xcconfig:
	* macosx/tkMacOSXAETE.r:
	* macosx/tkMacOSXConfig.c:
	* macosx/tkMacOSXCursors.r:
	* macosx/tkMacOSXKeyboard.c:
	* macosx/tkMacOSXSend.c:
	* macosx/ttkMacOSXTheme.c:
	* macosx/tkMacOSXXCursors.r:
	* macosx/README:

	* macosx/GNUmakefile:		fix/add copyright and license refs.
	* macosx/Tk-Info.plist.in:
	* macosx/Wish-Info.plist.in:
	* macosx/Wish.xcode/project.pbxproj:
	* macosx/Wish.xcodeproj/project.pbxproj:
	* macosx/tkMacOSX.h:

1 files changed, 149 insertions, 154 deletions

diff --git a/macosx/tkMacOSXDebug.c b/macosx/tkMacOSXDebug.c
index 5537d1c..b0dc136 100644
--- a/macosx/tkMacOSXDebug.c
+++ b/macosx/tkMacOSXDebug.c
@@ -2,7 +2,7 @@
  * tkMacOSXDebug.c --
  *
  *	Implementation of Macintosh specific functions for debugging MacOS events,
- *      regions, etc...
+ *	regions, etc...
  *
  * Copyright 2001, Apple Computer, Inc.
  * Copyright (c) 2006-2007 Daniel A. Steffen <das@users.sourceforge.net>
@@ -10,51 +10,51 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- *      The following terms apply to all files originating from Apple
- *      Computer, Inc. ("Apple") and associated with the software
- *      unless explicitly disclaimed in individual files.
+ *	The following terms apply to all files originating from Apple
+ *	Computer, Inc. ("Apple") and associated with the software
+ *	unless explicitly disclaimed in individual files.
  *
  *
- *      Apple hereby grants permission to use, copy, modify,
- *      distribute, and license this software and its documentation
- *      for any purpose, provided that existing copyright notices are
- *      retained in all copies and that this notice is included
- *      verbatim in any distributions. No written agreement, license,
- *      or royalty fee is required for any of the authorized
- *      uses. Modifications to this software may be copyrighted by
- *      their authors and need not follow the licensing terms
- *      described here, provided that the new terms are clearly
- *      indicated on the first page of each file where they apply.
+ *	Apple hereby grants permission to use, copy, modify,
+ *	distribute, and license this software and its documentation
+ *	for any purpose, provided that existing copyright notices are
+ *	retained in all copies and that this notice is included
+ *	verbatim in any distributions. No written agreement, license,
+ *	or royalty fee is required for any of the authorized
+ *	uses. Modifications to this software may be copyrighted by
+ *	their authors and need not follow the licensing terms
+ *	described here, provided that the new terms are clearly
+ *	indicated on the first page of each file where they apply.
  *
  *
- *      IN NO EVENT SHALL APPLE, THE AUTHORS OR DISTRIBUTORS OF THE
- *      SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL,
- *      INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
- *      THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF,
- *      EVEN IF APPLE OR THE AUTHORS HAVE BEEN ADVISED OF THE
- *      POSSIBILITY OF SUCH DAMAGE.  APPLE, THE AUTHORS AND
- *      DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING,
- *      BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
- *      FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS
- *      SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND APPLE,THE
- *      AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
- *      MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *	IN NO EVENT SHALL APPLE, THE AUTHORS OR DISTRIBUTORS OF THE
+ *	SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL,
+ *	INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
+ *	THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF,
+ *	EVEN IF APPLE OR THE AUTHORS HAVE BEEN ADVISED OF THE
+ *	POSSIBILITY OF SUCH DAMAGE.  APPLE, THE AUTHORS AND
+ *	DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING,
+ *	BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ *	FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.	 THIS
+ *	SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND APPLE,THE
+ *	AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
+ *	MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
- *      GOVERNMENT USE: If you are acquiring this software on behalf
- *      of the U.S. government, the Government shall have only
- *      "Restricted Rights" in the software and related documentation
- *      as defined in the Federal Acquisition Regulations (FARs) in
- *      Clause 52.227.19 (c) (2).  If you are acquiring the software
- *      on behalf of the Department of Defense, the software shall be
- *      classified as "Commercial Computer Software" and the
- *      Government shall have only "Restricted Rights" as defined in
- *      Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
- *      foregoing, the authors grant the U.S. Government and others
- *      acting in its behalf permission to use and distribute the
- *      software in accordance with the terms specified in this
- *      license.
+ *	GOVERNMENT USE: If you are acquiring this software on behalf
+ *	of the U.S. government, the Government shall have only
+ *	"Restricted Rights" in the software and related documentation
+ *	as defined in the Federal Acquisition Regulations (FARs) in
+ *	Clause 52.227.19 (c) (2).  If you are acquiring the software
+ *	on behalf of the Department of Defense, the software shall be
+ *	classified as "Commercial Computer Software" and the
+ *	Government shall have only "Restricted Rights" as defined in
+ *	Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
+ *	foregoing, the authors grant the U.S. Government and others
+ *	acting in its behalf permission to use and distribute the
+ *	software in accordance with the terms specified in this
+ *	license.
  *
- * RCS: @(#) $Id: tkMacOSXDebug.c,v 1.11 2007/03/07 23:46:34 das Exp $
+ * RCS: @(#) $Id: tkMacOSXDebug.c,v 1.12 2007/04/23 21:24:33 das Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -66,13 +66,13 @@
 #include <mach-o/nlist.h>
 
 typedef struct {
- EventKind kind;
- char     * name;
+    EventKind kind;
+    const char * name;
 } MyEventName;
 
 typedef struct {
- EventClass    c;
- MyEventName * names;
+    EventClass c;
+    MyEventName * names;
 } MyEventNameList;
 
 static MyEventName windowEventNames [] = {
@@ -161,7 +161,7 @@ static MyEventName keyboardEventNames [] = {
 
 static MyEventName appEventNames [] = {
  { kEventAppActivated, "Activated"},
- { kEventAppDeactivated, "Deactivated"},  
+ { kEventAppDeactivated, "Deactivated"},
  { kEventAppQuit, "Quit"},
  { kEventAppLaunchNotification, "LaunchNotification"},
  { kEventAppLaunched, "Launched"},
@@ -253,83 +253,79 @@ static MyEventName classicEventNames [] = {
 };
 #endif /* TK_MACOSXDEBUG_UNUSED */
 
-MODULE_SCOPE char * 
-TkMacOSXCarbonEventToAscii(EventRef eventRef, char * buf)
-{     
+MODULE_SCOPE char *
+TkMacOSXCarbonEventToAscii(EventRef eventRef)
+{
     EventClass eventClass;
-    EventKind  eventKind;
+    EventKind eventKind;
     MyEventNameList * list = eventNameList;
-    MyEventName     * names = NULL;
-    int *       iPtr = ( int * )buf;
-    char *      iBuf = buf;
+    MyEventName * names = NULL;
+    static char str[256];
+    char *buf = str;
+    int *iPtr = (int*)str;
     int found = 0;
 
     eventClass = GetEventClass(eventRef);
     eventKind = GetEventKind(eventRef);
 
     *iPtr = eventClass;
-    buf [ 4 ] = 0;
+    buf[4] = 0;
     strcat(buf, " ");
     buf += strlen(buf);
     while (list->names && (!names) ) {
-        if (eventClass == list->c) {
-            names = list -> names;
-        } else {
-            list++;
-        }
+	if (eventClass == list->c) {
+	    names = list -> names;
+	} else {
+	    list++;
+	}
     }
-    if (names) {
-       found = 0;
-       while (names->name && !found) {
-           if (eventKind == names->kind) {
-               sprintf(buf, "%-20s", names->name);
-               found = 1;
-           } else {
-               names++;
-           }
-        }
-        if (!found) {
-            sprintf(buf, "%-20d", eventKind );
-        }
-    } else {
-        sprintf(buf, "%-20d", eventKind );
+   while (names && names->name) {
+       if (eventKind == names->kind) {
+	   snprintf(buf, 250, "%-20s", names->name);
+	   break;
+       } else {
+	   names++;
+       }
+    }
+    if (!found) {
+	snprintf(buf, 250, "%-20d", eventKind);
     }
-    return iBuf;
+    return str;
 }
 
 #ifdef TK_MACOSXDEBUG_UNUSED
 MODULE_SCOPE char *
 TkMacOSXCarbonEventKindToAscii(EventRef eventRef, char * buf )
-{     
+{
    EventClass eventClass;
    EventKind  eventKind;
    MyEventNameList * list = eventNameList;
-   MyEventName     * names = NULL;
-   int               found = 0;
+   MyEventName	   * names = NULL;
+   int		     found = 0;
    eventClass = GetEventClass(eventRef);
    eventKind = GetEventKind(eventRef);
    while (list->names && (!names) ) {
        if (eventClass == list -> c) {
-           names = list -> names;
+	   names = list -> names;
        } else {
-           list++;
+	   list++;
        }
    }
    if (names) {
        found = 0;
        while ( names->name && !found ) {
-           if (eventKind == names->kind) {
-               sprintf(buf,"%s",names->name);
-               found = 1;
-           } else {
-               names++;
-           }
+	   if (eventKind == names->kind) {
+	       sprintf(buf,"%s",names->name);
+	       found = 1;
+	   } else {
+	       names++;
+	   }
        }
     }
     if (!found) {
-        sprintf ( buf,"%d", eventKind );
+	sprintf ( buf,"%d", eventKind );
      } else {
-        sprintf ( buf,"%d", eventKind );
+	sprintf ( buf,"%d", eventKind );
      }
      return buf;
 }
@@ -337,46 +333,45 @@ TkMacOSXCarbonEventKindToAscii(EventRef eventRef, char * buf )
 MODULE_SCOPE char *
 TkMacOSXClassicEventToAscii(EventRecord * eventPtr, char * buf )
 {
-    MyEventName     * names = NULL;
+    MyEventName	    * names = NULL;
     int found = 0;
     names = classicEventNames;
     while ( names -> name && !found )
-        if (eventPtr->what == names->kind) {
-            int * iPtr;
-            char cBuf[8];
-            iPtr=(int *) &cBuf;
-            *iPtr = eventPtr->message;
-            cBuf[4] = 0;
-            sprintf(buf, "%-16s %08x %04x %s", names->name,
-                    (int) eventPtr->message,
-                    eventPtr->modifiers, 
-                    cBuf);
-            found = 1;
-        } else {
-          names++;
-        }
+	if (eventPtr->what == names->kind) {
+	    int * iPtr;
+	    char cBuf[8];
+	    iPtr=(int *) &cBuf;
+	    *iPtr = eventPtr->message;
+	    cBuf[4] = 0;
+	    sprintf(buf, "%-16s %08x %04x %s", names->name,
+		    (int) eventPtr->message,
+		    eventPtr->modifiers,
+		    cBuf);
+	    found = 1;
+	} else {
+	  names++;
+	}
     if (!found) {
-               sprintf(buf,"%-16d %08x %08x, %s",
-                       eventPtr->what, (int) eventPtr->message,
-                       eventPtr->modifiers, buf);
+	       sprintf(buf,"%-16d %08x %08x, %s",
+		       eventPtr->what, (int) eventPtr->message,
+		       eventPtr->modifiers, buf);
     }
     return buf;
- 
+
 }
 
 MODULE_SCOPE void
 TkMacOSXPrintPoint(char * tag, Point * p )
 {
-    fprintf(stderr,"%s %4d %4d\n",
-        tag,p->h,p->v );
+    TkMacOSXDbgMsg("%s %4d %4d", tag,p->h,p->v );
 }
 
 MODULE_SCOPE void
 TkMacOSXPrintRect(char * tag, Rect * r )
 {
-    fprintf(stderr,"%s %4d %4d %4d %4d (%dx%d)\n",
-        tag, r->left, r->top, r->right, r->bottom,
-        r->right - r->left + 1, r->bottom - r->top + 1);
+    TkMacOSXDbgMsg("%s %4d %4d %4d %4d (%dx%d)",
+	tag, r->left, r->top, r->right, r->bottom,
+	r->right - r->left + 1, r->bottom - r->top + 1);
 }
 
 MODULE_SCOPE void
@@ -393,23 +388,23 @@ TkMacOSXPrintWindowTitle(char * tag, WindowRef window )
     Str255 title;
     GetWTitle(window,title);
     title [title[0] + 1] = 0;
-    fprintf(stderr, "%s %s\n", tag, title +1 );
+    TkMacOSXDbgMsg("%s %s", tag, title +1 );
 }
 
 typedef struct {
- int    msg;
+ int	msg;
  char * name;
 } MsgName;
 
 static MsgName msgNames [] = {
-    { kMenuDrawMsg,       "Draw"},
-    { kMenuSizeMsg,       "Size"},
-    { kMenuPopUpMsg,      "PopUp"},
-    { kMenuCalcItemMsg,   "CalcItem" },
+    { kMenuDrawMsg,	  "Draw"},
+    { kMenuSizeMsg,	  "Size"},
+    { kMenuPopUpMsg,	  "PopUp"},
+    { kMenuCalcItemMsg,	  "CalcItem" },
     { kMenuThemeSavvyMsg, "ThemeSavvy"},
-    { kMenuInitMsg,       "Init" },
-    { kMenuDisposeMsg,    "Dispose" },
-    { kMenuFindItemMsg,   "FindItem" },
+    { kMenuInitMsg,	  "Init" },
+    { kMenuDisposeMsg,	  "Dispose" },
+    { kMenuFindItemMsg,	  "FindItem" },
     { kMenuHiliteItemMsg, "HiliteItem" },
     { kMenuDrawItemsMsg,  "DrawItems" },
     { -1, NULL }
@@ -420,12 +415,12 @@ TkMacOSXMenuMessageToAscii(int msg, char * s)
 {
     MsgName * msgNamePtr;
     for (msgNamePtr = msgNames;msgNamePtr->name;) {
-        if (msgNamePtr->msg == msg) {
-           strcpy(s,msgNamePtr->name);
-           return s;
-        } else {
-            msgNamePtr++;
-        }
+	if (msgNamePtr->msg == msg) {
+	   strcpy(s,msgNamePtr->name);
+	   return s;
+	} else {
+	    msgNamePtr++;
+	}
     }
     sprintf(s,"unknown : %d", msg );
     return s;
@@ -434,24 +429,24 @@ TkMacOSXMenuMessageToAscii(int msg, char * s)
 static MsgName trackingNames [] = {
     { kMouseTrackingMousePressed  , "MousePressed  " },
     { kMouseTrackingMouseReleased , "MouseReleased " },
-    { kMouseTrackingMouseExited   , "MouseExited   " },
+    { kMouseTrackingMouseExited	  , "MouseExited   " },
     { kMouseTrackingMouseEntered  , "MouseEntered  " },
-    { kMouseTrackingMouseMoved    , "MouseMoved    " },
+    { kMouseTrackingMouseMoved	  , "MouseMoved	   " },
     { kMouseTrackingKeyModifiersChanged, "KeyModifiersChanged" },
     { kMouseTrackingUserCancelled , "UserCancelled " },
-    { kMouseTrackingTimedOut      , "TimedOut      " },
+    { kMouseTrackingTimedOut	  , "TimedOut	   " },
     { -1, NULL }
 };
 
 MODULE_SCOPE char *
-TkMacOSXMouseTrackingResultToAscii(MouseTrackingResult r, char * buf) 
+TkMacOSXMouseTrackingResultToAscii(MouseTrackingResult r, char * buf)
 {
     MsgName * namePtr;
     for (namePtr = trackingNames; namePtr->name; namePtr++) {
-        if (namePtr->msg == r) {
-            strcpy(buf, namePtr->name);
-            return buf;
-        }
+	if (namePtr->msg == r) {
+	    strcpy(buf, namePtr->name);
+	    return buf;
+	}
     }
     sprintf(buf, "Unknown mouse tracking result : %d", r);
     return buf;
@@ -464,24 +459,24 @@ TkMacOSXMouseTrackingResultToAscii(MouseTrackingResult r, char * buf)
  * TkMacOSXGetNamedDebugSymbol --
  *
  *
- *	  Dynamically acquire address of a named symbol from a loaded
- *	  dynamic library, so that we can use API that may not be
- *	  available on all OS versions.
- *	  For debugging purposes, if we cannot find the symbol with the
- *	  usual dynamic library APIs, we manually walk the symbol table
- *	  of the loaded library. This allows access to unexported
- *	  symbols such as private_extern internal debugging functions.
- *	  If module is NULL or the empty string, search all loaded
- *	  libraries (could be very expensive and should be avoided).
+ *	Dynamically acquire address of a named symbol from a loaded
+ *	dynamic library, so that we can use API that may not be
+ *	available on all OS versions.
+ *	For debugging purposes, if we cannot find the symbol with the
+ *	usual dynamic library APIs, we manually walk the symbol table
+ *	of the loaded library. This allows access to unexported
+ *	symbols such as private_extern internal debugging functions.
+ *	If module is NULL or the empty string, search all loaded
+ *	libraries (could be very expensive and should be avoided).
+ *
+ *	THIS FUCTION IS ONLY TO BE USED FOR DEBUGGING PURPOSES, IT MAY
+ *	BREAK UNEXPECTEDLY IN THE FUTURE !
  *
- *	  THIS FUCTION IS ONLY TO BE USED FOR DEBUGGING PURPOSES, IT MAY
- *	  BREAK UNEXPECTEDLY IN THE FUTURE !
- *	 
  * Results:
- *	  Address of given symbol or NULL if unavailable.
+ *	Address of given symbol or NULL if unavailable.
  *
  * Side effects:
- *	  None.
+ *	None.
  *
  *----------------------------------------------------------------------
  */
@@ -519,8 +514,8 @@ TkMacOSXGetNamedDebugSymbol(const char* module, const char* symbol)
 		struct symtab_command *st = NULL;
 		struct segment_command *sg = NULL;
 		uint32_t j, m, nsect = 0, txtsectx = 0;
-		
-		lc = (struct load_command*)((char *) mh +
+
+		lc = (struct load_command*)((const char*) mh +
 			sizeof(struct mach_header));
 		m = mh->ncmds;
 		for (j = 0; j < m; j++) {
@@ -531,12 +526,12 @@ TkMacOSXGetNamedDebugSymbol(const char* module, const char* symbol)
 			if (!txtsectx) {
 			    /* Count total sections until (__TEXT, __text) */
 			    uint32_t k, ns = sg->nsects;
-			    
+
 			    if (strcmp(sg->segname, SEG_TEXT) == 0) {
 				struct section *s = (struct section *)(
 					(char *)sg +
 					sizeof(struct segment_command));
-				
+
 				for(k = 0; k < ns; k++) {
 				    if (strcmp(s->sectname, SECT_TEXT) == 0) {
 					txtsectx = nsect+k+1;
@@ -559,7 +554,7 @@ TkMacOSXGetNamedDebugSymbol(const char* module, const char* symbol)
 		    struct nlist *sym;
 		    uint32_t strsize = st->strsize;
 		    int32_t strx;
-		    
+
 		    /* Offset file positions by difference to actual position
 		       in memory of last segment before symbol table: */
 		    base = (intptr_t) sg->vmaddr + slide - sg->fileoff;
@@ -573,7 +568,7 @@ TkMacOSXGetNamedDebugSymbol(const char* module, const char* symbol)
 				sym->n_sect == txtsectx &&
 				strx > 0 && (uint32_t) strx < strsize &&
 				strcmp(strings + strx, symbol) == 0) {
-			    addr = (void*) sym->n_value + slide;
+			    addr = (char*) sym->n_value + slide;
 			    break;
 			}
 			sym++;