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

	* macosx/tkMacOSXEvent.c:	 handler for all kEventClassWindow and
	* macosx/tkMacOSXEvent.h:	 kEventClassMouse events; move all
	* macosx/tkMacOSXNotify.c:	 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
	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
	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; disable broken QD stippling.

	* macosx/tkMacOSXMenu.c:		large-scale rewrite of custom
	* macosx/tkMacOSXMenu.r (removed):	MDEF and related code that
	* unix/Makefile.in:			restores many longtime-MIA
	features to working order (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/tkMacOSXFont.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/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/tkMacOSXAETE.r:	fix whitespace.
	* macosx/tkMacOSXConfig.c:
	* macosx/tkMacOSXCursors.r:
	* macosx/tkMacOSXKeyboard.c:
	* macosx/tkMacOSXSend.c:
	* macosx/tkMacOSXXCursors.r:
	* macosx/README:

	* macosx/Makefile:		fix/add copyright and license refs.
	* macosx/Tk-Info.plist.in:
	* macosx/Wish-Info.plist.in:
	* macosx/tkMacOSX.h:

1 files changed, 909 insertions, 967 deletions

diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index 0878819..65e1043 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -1,16 +1,17 @@
-/* 
+/*
  * tkMacOSXButton.c --
  *
- *        This file implements the Macintosh specific portion of the
- *        button widgets.
+ *	This file implements the Macintosh specific portion of the
+ *	button widgets.
  *
  * Copyright (c) 1996-1997 by Sun Microsystems, Inc.
  * Copyright 2001, Apple Computer, Inc.
+ * Copyright (c) 2006-2007 Daniel A. Steffen <das@users.sourceforge.net>
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXButton.c,v 1.2.2.14 2006/05/26 21:43:05 hobbs Exp $
+ * RCS: @(#) $Id: tkMacOSXButton.c,v 1.2.2.15 2007/04/29 02:26:47 das Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -23,6 +24,7 @@
 /*
  * Default insets for controls
  */
+
 #define DEF_INSET_LEFT 2
 #define DEF_INSET_RIGHT 2
 #define DEF_INSET_TOP 2
@@ -37,7 +39,7 @@
 #define DRAW_CUSTOM	2	/* Make our own button drawing. */
 #define DRAW_BEVEL	3
 
-/*  
+/*
  * Declaration of Mac specific button structure.
  */
 
@@ -46,43 +48,42 @@ typedef struct {
     SInt16 minValue;
     SInt16 maxValue;
     SInt16 procID;
-    int	   isBevel;
+    int isBevel;
 } MacControlParams;
 
 typedef struct {
     int drawType;
     Tk_3DBorder border;
     int relief;
-    int offset;			/* 0 means this is a normal widget.  1 means
+    int offset;			/* 0 means this is a normal widget. 1 means
 				 * it is an image button, so we offset the
 				 * image to make the button appear to move
 				 * up and down as the relief changes. */
-    GC	gc;
+    GC gc;
     int hasImageOrBitmap;
 } DrawParams;
 
-
 typedef struct {
-    TkButton                 info;       /* generic button info */
-    int                      id;
-    int                      usingControl;
-    int                      useTkText;
-    int                      flags;     /* initialisation status */
-    MacControlParams         params;
-    WindowRef                windowRef;
-    RGBColor                 userPaneBackground;
-    ControlRef               userPane;  /* Carbon control */
-    ControlRef               control;   /* Carbon control */
-    Str255                   controlTitle;
-    ControlFontStyleRec      fontStyle;
-    /* 
-     * the following are used to store the image content for
-     * beveled buttons - i.e. buttons with images.
+    TkButton info;		/* Generic button info */
+    int id;
+    int usingControl;
+    int useTkText;
+    int flags;			/* Initialisation status */
+    MacControlParams params;
+    WindowRef windowRef;
+    unsigned long userPaneBackground;
+    ControlRef userPane;	/* Carbon control */
+    ControlRef control;		/* Carbon control */
+    Str255 controlTitle;
+    ControlFontStyleRec fontStyle;
+    /*
+     * The following are used to store the image content for
+     * beveled buttons, i.e. buttons with images.
      */
-    CCTabHandle              tabHandle;
+    CCTabHandle tabHandle;
+    Pixmap picPixmap;
     ControlButtonContentInfo bevelButtonContent;
-    OpenCPicParams           picParams;
-    Pixmap                   picPixmap;
+    OpenCPicParams picParams;
 } MacButton;
 
 /*
@@ -90,31 +91,31 @@ typedef struct {
  */
 
 
-static OSErr SetUserPaneDrawProc(ControlRef control,
-        ControlUserPaneDrawProcPtr upp);
-static OSErr SetUserPaneSetUpSpecialBackgroundProc(ControlRef control,
-        ControlUserPaneBackgroundProcPtr upp);
+static OSStatus SetUserPaneDrawProc(ControlRef control,
+	ControlUserPaneDrawProcPtr upp);
+static OSStatus SetUserPaneSetUpSpecialBackgroundProc(ControlRef control,
+	ControlUserPaneBackgroundProcPtr upp);
 static void UserPaneDraw(ControlRef control, ControlPartCode cpc);
 static void UserPaneBackgroundProc(ControlHandle,
-        ControlBackgroundPtr info);
-
-static void ButtonEventProc _ANSI_ARGS_(( ClientData clientData, XEvent *eventPtr));
-static int UpdateControlColors _ANSI_ARGS_((MacButton *mbPtr ));
-static void TkMacOSXComputeControlParams _ANSI_ARGS_((TkButton * butPtr, MacControlParams * paramsPtr));
-static int TkMacOSXComputeDrawParams _ANSI_ARGS_((TkButton * butPtr, DrawParams * dpPtr));
-static void TkMacOSXDrawControl _ANSI_ARGS_((MacButton *butPtr,
-        GWorldPtr destPort, GC gc, Pixmap pixmap));
-static void SetupBevelButton _ANSI_ARGS_((MacButton *butPtr,
-        ControlRef controlHandle, 
-        GWorldPtr destPort, GC gc, Pixmap pixmap));
+	ControlBackgroundPtr info);
+
+static void ButtonEventProc(ClientData clientData, XEvent *eventPtr);
+static int UpdateControlColors(MacButton *mbPtr);
+static void TkMacOSXComputeControlParams(TkButton *butPtr,
+	MacControlParams *paramsPtr);
+static int TkMacOSXComputeDrawParams(TkButton *butPtr, DrawParams *dpPtr);
+static void TkMacOSXDrawControl(MacButton *butPtr, GWorldPtr destPort, GC gc,
+	Pixmap pixmap);
+static void SetupBevelButton(MacButton *butPtr, ControlRef controlHandle,
+	GWorldPtr destPort, GC gc, Pixmap pixmap);
 
 /*
  * The class procedure table for the button widgets.
  */
 
-Tk_ClassProcs tkpButtonProcs = { 
-    sizeof(Tk_ClassProcs),        /* size */
-    TkButtonWorldChanged,        /* worldChangedProc */
+Tk_ClassProcs tkpButtonProcs = {
+    sizeof(Tk_ClassProcs),	/* size */
+    TkButtonWorldChanged,	/* worldChangedProc */
 };
 
 static int bCount;
@@ -126,13 +127,13 @@ int tkPictureIsOpen;
  *
  * TkpCreateButton --
  *
- *        Allocate a new TkButton structure.
+ *	Allocate a new TkButton structure.
  *
  * Results:
- *        Returns a newly allocated TkButton structure.
+ *	Returns a newly allocated TkButton structure.
  *
  * Side effects:
- *        Registers an event handler for the widget.
+ *	Registers an event handler for the widget.
  *
  *----------------------------------------------------------------------
  */
@@ -141,16 +142,14 @@ TkButton *
 TkpCreateButton(
     Tk_Window tkwin)
 {
-    MacButton *macButtonPtr;
-    macButtonPtr = (MacButton *) ckalloc(sizeof(MacButton));
+    MacButton *macButtonPtr = (MacButton *) ckalloc(sizeof(MacButton));
+
     Tk_CreateEventHandler(tkwin, ActivateMask,
-            ButtonEventProc, (ClientData) macButtonPtr);
+	    ButtonEventProc, (ClientData) macButtonPtr);
     macButtonPtr->id = bCount++;
     macButtonPtr->usingControl = 0;
     macButtonPtr->flags = 0;
-    macButtonPtr->userPaneBackground.red = 0;
-    macButtonPtr->userPaneBackground.green = 0;
-    macButtonPtr->userPaneBackground.blue = ~0;
+    macButtonPtr->userPaneBackground = PIXEL_MAGIC << 24;
     macButtonPtr->userPane = NULL;
     macButtonPtr->control = NULL;
     macButtonPtr->controlTitle[0] = 0;
@@ -165,6 +164,7 @@ TkpCreateButton(
     macButtonPtr->bevelButtonContent.contentType = kControlContentPictHandle;
     bzero(&macButtonPtr->params, sizeof(macButtonPtr->params));
     bzero(&macButtonPtr->fontStyle,sizeof(macButtonPtr->fontStyle));
+
     return (TkButton *)macButtonPtr;
 }
 
@@ -173,301 +173,292 @@ TkpCreateButton(
  *
  * TkpDisplayButton --
  *
- *        This procedure is invoked to display a button widget.  It is
- *        normally invoked as an idle handler.
+ *	This procedure is invoked to display a button widget. It is
+ *	normally invoked as an idle handler.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        Commands are output to X to display the button in its
- *        current mode.  The REDRAW_PENDING flag is cleared.
+ *	Commands are output to X to display the button in its
+ *	current mode. The REDRAW_PENDING flag is cleared.
  *
  *----------------------------------------------------------------------
  */
 
 void
 TkpDisplayButton(
-    ClientData clientData)        /* Information about widget. */
+    ClientData clientData)	/* Information about widget. */
 {
     MacButton *macButtonPtr = (MacButton *)clientData;
-    TkButton  *butPtr       = (TkButton *) clientData;
-    Tk_Window tkwin         = butPtr->tkwin;
-    int width, height, fullWidth, fullHeight;
-    int textXOffset, textYOffset;
-    int haveImage = 0, haveText = 0;
-    GWorldPtr destPort;
-    int borderWidth;
+    TkButton *butPtr = (TkButton *) clientData;
+    Tk_Window tkwin = butPtr->tkwin;
+    CGrafPtr destPort, savePort;
+    Boolean portChanged;
     Pixmap pixmap;
-    int wasUsingControl;
-    int imageWidth = 0, imageHeight = 0;
+    int width, height, fullWidth, fullHeight, textXOffset, textYOffset;
+    int borderWidth, wasUsingControl;
+    int haveImage = 0, haveText = 0, imageWidth = 0, imageHeight = 0;
     int imageXOffset = 0, imageYOffset = 0; /* image information that will
 					     * be used to restrict disabled
 					     * pixmap as well */
-    DrawParams drawParams, * dpPtr = &drawParams;
+    DrawParams drawParams, *dpPtr = &drawParams;
 
     butPtr->flags &= ~REDRAW_PENDING;
     if ((butPtr->tkwin == NULL) || !Tk_IsMapped(tkwin)) {
-        return;
+	return;
     }
 
     pixmap = (Pixmap) Tk_WindowId(tkwin);
     wasUsingControl = macButtonPtr->usingControl;
 
     if (TkMacOSXComputeDrawParams(butPtr, &drawParams) ) {
-        macButtonPtr->usingControl = 1;
-        if (butPtr->type == TYPE_BUTTON) {
-            macButtonPtr->useTkText = 0;
-        } else {
-            macButtonPtr->useTkText = 1;
-        }
+	macButtonPtr->usingControl = 1;
+	if (butPtr->type == TYPE_BUTTON) {
+	    macButtonPtr->useTkText = 0;
+	} else {
+	    macButtonPtr->useTkText = 1;
+	}
     } else {
-        macButtonPtr->usingControl = 0;
-        macButtonPtr->useTkText = 1;
+	macButtonPtr->usingControl = 0;
+	macButtonPtr->useTkText = 1;
     }
-   
-    /* 
-     * set up clipping region.  Make sure the we are using the port
-     * for this button, or we will set the wrong window's clip. 
+
+    /*
+     * Set up clipping region. Make sure the we are using the port
+     * for this button, or we will set the wrong window's clip.
      */
-    
+
     destPort = TkMacOSXGetDrawablePort(pixmap);
-    SetGWorld(destPort, NULL);
+    portChanged = QDSwapPort(destPort, &savePort);
     TkMacOSXSetUpClippingRgn(pixmap);
 
-
     /*
-     * See the comment in UpdateControlColors as to why we use the 
+     * See the comment in UpdateControlColors as to why we use the
      * highlightbackground for the border of Macintosh buttons.
      */
 
     if (macButtonPtr->useTkText) {
-        if (butPtr->type == TYPE_BUTTON) {
-            Tk_Fill3DRectangle(tkwin, pixmap, butPtr->highlightBorder, 0, 0,
-                Tk_Width(tkwin), Tk_Height(tkwin), 0, TK_RELIEF_FLAT);
-        } else {
-            Tk_Fill3DRectangle(tkwin, pixmap, butPtr->normalBorder, 0, 0,
-                Tk_Width(tkwin), Tk_Height(tkwin), 0, TK_RELIEF_FLAT);
-        }
+	if (butPtr->type == TYPE_BUTTON) {
+	    Tk_Fill3DRectangle(tkwin, pixmap, butPtr->highlightBorder, 0, 0,
+		    Tk_Width(tkwin), Tk_Height(tkwin), 0, TK_RELIEF_FLAT);
+	} else {
+	    Tk_Fill3DRectangle(tkwin, pixmap, butPtr->normalBorder, 0, 0,
+		    Tk_Width(tkwin), Tk_Height(tkwin), 0, TK_RELIEF_FLAT);
+	}
     }
 
     /*
      * Draw the native portion of the buttons. Start by creating the control
-     * if it doesn't already exist.  Then configure the Macintosh control from
-     * the Tk info.  Finally, we call Draw1Control to draw to the screen.
+     * if it doesn't already exist. Then configure the Macintosh control from
+     * the Tk info. Finally, we call Draw1Control to draw to the screen.
      */
 
     if (macButtonPtr->usingControl) {
-        borderWidth = 0;
-        TkMacOSXDrawControl(macButtonPtr, destPort, dpPtr->gc, pixmap);
-    } else {
-       if (wasUsingControl && macButtonPtr->userPane) {
-           DisposeControl(macButtonPtr->userPane);
-           macButtonPtr->userPane = NULL;
-           macButtonPtr->control  = NULL;
-           macButtonPtr->flags = 0;
-       }
+	borderWidth = 0;
+	TkMacOSXDrawControl(macButtonPtr, destPort, dpPtr->gc, pixmap);
+    } else if (wasUsingControl && macButtonPtr->userPane) {
+	DisposeControl(macButtonPtr->userPane);
+	macButtonPtr->userPane = NULL;
+	macButtonPtr->control = NULL;
+	macButtonPtr->flags = 0;
     }
 
     if ((dpPtr->drawType == DRAW_CUSTOM) || (dpPtr->drawType == DRAW_LABEL)) {
-        borderWidth = butPtr->borderWidth;
+	borderWidth = butPtr->borderWidth;
     }
 
     /*
-     * Display image or bitmap or text for button.  This has
+     * Display image or bitmap or text for button. This has
      * already been done under Appearance with the Bevel
      * button types.
      */
 
     if (dpPtr->drawType == DRAW_BEVEL) {
-        /* Empty Body */
-    } else {
-        if (butPtr->image != None) {
-            Tk_SizeOfImage(butPtr->image, &width, &height);
-            haveImage = 1;
-        } else if (butPtr->bitmap != None) {
-            Tk_SizeOfBitmap(butPtr->display, butPtr->bitmap, &width, &height);
-            haveImage = 1;
-        }
-	imageWidth  = width;
-	imageHeight = height;
-
-        haveText = (butPtr->textWidth != 0 && butPtr->textHeight != 0);
-        if (butPtr->compound != COMPOUND_NONE && haveImage && haveText) {
-            int x;
-            int y;
-            textXOffset = 0;
-            textYOffset = 0;
-            fullWidth = 0;
-            fullHeight = 0;
-            
-            switch ((enum compound) butPtr->compound) {
-                case COMPOUND_TOP: 
-                case COMPOUND_BOTTOM: {
-                    /* Image is above or below text */
-                    if (butPtr->compound == COMPOUND_TOP) {
-                        textYOffset = height + butPtr->padY;
-                    } else {
-                        imageYOffset = butPtr->textHeight + butPtr->padY;
-                    }
-                    fullHeight = height + butPtr->textHeight + butPtr->padY;
-                    fullWidth = (width > butPtr->textWidth ? width :
-                            butPtr->textWidth);
-                    textXOffset = (fullWidth - butPtr->textWidth)/2;
-                    imageXOffset = (fullWidth - width)/2;
-                    break;
-                }
-                case COMPOUND_LEFT:
-                case COMPOUND_RIGHT: {
-                    /* 
-                     * Image is left or right of text 
-                     */
-                     
-                    if (butPtr->compound == COMPOUND_LEFT) {
-                        textXOffset = width + butPtr->padX;
-                    } else {
-                        imageXOffset = butPtr->textWidth + butPtr->padX;
-                    }
-                    fullWidth = butPtr->textWidth + butPtr->padX + width;
-                    fullHeight = (height > butPtr->textHeight ? height :
-                            butPtr->textHeight);
-                    textYOffset = (fullHeight - butPtr->textHeight)/2;
-                    imageYOffset = (fullHeight - height)/2;
-                    break;
-                }
-                case COMPOUND_CENTER: {
-                    /* 
-                     * Image and text are superimposed 
-                     */
-                     
-                    fullWidth = (width > butPtr->textWidth ? width :
-                            butPtr->textWidth);
-                    fullHeight = (height > butPtr->textHeight ? height :
-                            butPtr->textHeight);
-                    textXOffset = (fullWidth - butPtr->textWidth)/2;
-                    imageXOffset = (fullWidth - width)/2;
-                    textYOffset = (fullHeight - butPtr->textHeight)/2;
-                    imageYOffset = (fullHeight - height)/2;
-                    break;
-                }
-                case COMPOUND_NONE: {break;}
-            }
-            
-            TkComputeAnchor(butPtr->anchor, tkwin, butPtr->padX, butPtr->padY,
-                    butPtr->indicatorSpace + fullWidth, fullHeight, &x, &y);
-            
-            x += butPtr->indicatorSpace;
-            
-            x += dpPtr->offset;
-            y += dpPtr->offset;
-            if (dpPtr->relief == TK_RELIEF_RAISED) {
-                x -= dpPtr->offset;
-                y -= dpPtr->offset;
-            } else if (dpPtr->relief == TK_RELIEF_SUNKEN) {
-                x += dpPtr->offset;
-                y += dpPtr->offset;
-            }
-	    imageXOffset += x;
-	    imageYOffset += y;
-            if (butPtr->image != NULL) {
-                if ((butPtr->selectImage != NULL) &&
-                        (butPtr->flags & SELECTED)) {
-                    Tk_RedrawImage(butPtr->selectImage, 0, 0,
-                            width, height, pixmap, imageXOffset, imageYOffset);
-                } else {
-                    Tk_RedrawImage(butPtr->image, 0, 0, width,
-                            height, pixmap, imageXOffset, imageYOffset);
-                }
-            } else {
-                XSetClipOrigin(butPtr->display, dpPtr->gc,
-			imageXOffset, imageYOffset);
-                XCopyPlane(butPtr->display, butPtr->bitmap, pixmap, dpPtr->gc,
-                        0, 0, (unsigned int) width, (unsigned int) height,
-			imageXOffset, imageYOffset, 1);
-                XSetClipOrigin(butPtr->display, dpPtr->gc, 0, 0);
-            }
-
-            if (macButtonPtr->useTkText) {
-                Tk_DrawTextLayout(butPtr->display, pixmap, 
-                        dpPtr->gc, butPtr->textLayout,
-                        x + textXOffset, y + textYOffset, 0, -1);
-                Tk_UnderlineTextLayout(butPtr->display, pixmap, dpPtr->gc,
-                        butPtr->textLayout, 
-                        x + textXOffset, y + textYOffset,
-                        butPtr->underline);
-            }
-            y += fullHeight/2;
-        } else {
-            if (haveImage) {
-                int x = 0;
-                int y;
-
-                TkComputeAnchor(butPtr->anchor, tkwin, 0, 0,
-                        butPtr->indicatorSpace + width, height, &x, &y);
-                x += butPtr->indicatorSpace;
-
-                x += dpPtr->offset;
-                y += dpPtr->offset;
-                if (dpPtr->relief == TK_RELIEF_RAISED) {
-                    x -= dpPtr->offset;
-                    y -= dpPtr->offset;
-                } else if (dpPtr->relief == TK_RELIEF_SUNKEN) {
-                    x += dpPtr->offset;
-                    y += dpPtr->offset;
-                }
-		imageXOffset += x;
-		imageYOffset += y;
-                if (butPtr->image != NULL) {
-                    if ((butPtr->selectImage != NULL) &&
-                            (butPtr->flags & SELECTED)) {
-                        Tk_RedrawImage(butPtr->selectImage, 0, 0, width,
-                                height, pixmap, imageXOffset, imageYOffset);
-                    } else {
-                        Tk_RedrawImage(butPtr->image, 0, 0, width, height,
-                                pixmap, imageXOffset, imageYOffset);
-                    }
-                } else {
-                    XSetClipOrigin(butPtr->display, dpPtr->gc, x, y);
-                    XCopyPlane(butPtr->display, butPtr->bitmap, 
-                            pixmap, dpPtr->gc,
-                            0, 0, (unsigned int) width,
-                            (unsigned int) height, x, y, 1);
-                    XSetClipOrigin(butPtr->display, dpPtr->gc, 0, 0);
-                }
-                y += height/2;
-            } else if (macButtonPtr->useTkText) {
-                int x = 0;
-                int y;
-                TkComputeAnchor(butPtr->anchor, tkwin, butPtr->padX,
-                        butPtr->padY,
-                        butPtr->indicatorSpace + butPtr->textWidth,
-                        butPtr->textHeight, &x, &y);                
-                x += butPtr->indicatorSpace;                
-                Tk_DrawTextLayout(butPtr->display, pixmap, dpPtr->gc,
-                        butPtr->textLayout, x, y, 0, -1);
-            }
-        }
+	goto applyStipple;
+    }
+
+    if (butPtr->image != None) {
+	Tk_SizeOfImage(butPtr->image, &width, &height);
+	haveImage = 1;
+    } else if (butPtr->bitmap != None) {
+	Tk_SizeOfBitmap(butPtr->display, butPtr->bitmap, &width, &height);
+	haveImage = 1;
+    }
+    imageWidth = width;
+    imageHeight = height;
+
+    haveText = (butPtr->textWidth != 0 && butPtr->textHeight != 0);
+    if (butPtr->compound != COMPOUND_NONE && haveImage && haveText) {
+	int x, y;
+
+	textXOffset = 0;
+	textYOffset = 0;
+	fullWidth = 0;
+	fullHeight = 0;
+
+	switch ((enum compound) butPtr->compound) {
+	    case COMPOUND_TOP:
+	    case COMPOUND_BOTTOM:
+		/*
+		 * Image is above or below text.
+		 */
+		if (butPtr->compound == COMPOUND_TOP) {
+		    textYOffset = height + butPtr->padY;
+		} else {
+		    imageYOffset = butPtr->textHeight + butPtr->padY;
+		}
+		fullHeight = height + butPtr->textHeight + butPtr->padY;
+		fullWidth = (width > butPtr->textWidth ? width :
+			butPtr->textWidth);
+		textXOffset = (fullWidth - butPtr->textWidth)/2;
+		imageXOffset = (fullWidth - width)/2;
+		break;
+
+	    case COMPOUND_LEFT:
+	    case COMPOUND_RIGHT:
+		/*
+		 * Image is left or right of text.
+		 */
+
+		if (butPtr->compound == COMPOUND_LEFT) {
+		    textXOffset = width + butPtr->padX;
+		} else {
+		    imageXOffset = butPtr->textWidth + butPtr->padX;
+		}
+		fullWidth = butPtr->textWidth + butPtr->padX + width;
+		fullHeight = (height > butPtr->textHeight ? height :
+			butPtr->textHeight);
+		textYOffset = (fullHeight - butPtr->textHeight)/2;
+		imageYOffset = (fullHeight - height)/2;
+		break;
+
+	    case COMPOUND_CENTER:
+		/*
+		 * Image and text are superimposed.
+		 */
+
+		fullWidth = (width > butPtr->textWidth ? width :
+			butPtr->textWidth);
+		fullHeight = (height > butPtr->textHeight ? height :
+			butPtr->textHeight);
+		textXOffset = (fullWidth - butPtr->textWidth)/2;
+		imageXOffset = (fullWidth - width)/2;
+		textYOffset = (fullHeight - butPtr->textHeight)/2;
+		imageYOffset = (fullHeight - height)/2;
+		break;
+
+	    case COMPOUND_NONE:
+		break;
+	}
+
+	TkComputeAnchor(butPtr->anchor, tkwin, butPtr->padX, butPtr->padY,
+		butPtr->indicatorSpace + fullWidth, fullHeight, &x, &y);
+
+	x += butPtr->indicatorSpace;
+
+	x += dpPtr->offset;
+	y += dpPtr->offset;
+	if (dpPtr->relief == TK_RELIEF_RAISED) {
+	    x -= dpPtr->offset;
+	    y -= dpPtr->offset;
+	} else if (dpPtr->relief == TK_RELIEF_SUNKEN) {
+	    x += dpPtr->offset;
+	    y += dpPtr->offset;
+	}
+	imageXOffset += x;
+	imageYOffset += y;
+	if (butPtr->image != NULL) {
+	    if ((butPtr->selectImage != NULL) && (butPtr->flags & SELECTED)) {
+		Tk_RedrawImage(butPtr->selectImage, 0, 0, width, height,
+			pixmap, imageXOffset, imageYOffset);
+	    } else {
+		Tk_RedrawImage(butPtr->image, 0, 0, width, height,
+			pixmap, imageXOffset, imageYOffset);
+	    }
+	} else {
+	    XSetClipOrigin(butPtr->display, dpPtr->gc, imageXOffset,
+		    imageYOffset);
+	    XCopyPlane(butPtr->display, butPtr->bitmap, pixmap, dpPtr->gc,
+		    0, 0, width, height, imageXOffset, imageYOffset, 1);
+	    XSetClipOrigin(butPtr->display, dpPtr->gc, 0, 0);
+	}
+
+	if (macButtonPtr->useTkText) {
+	    Tk_DrawTextLayout(butPtr->display, pixmap, dpPtr->gc,
+		    butPtr->textLayout, x + textXOffset, y + textYOffset, 0,
+		    -1);
+	    Tk_UnderlineTextLayout(butPtr->display, pixmap, dpPtr->gc,
+		    butPtr->textLayout, x + textXOffset, y + textYOffset,
+		    butPtr->underline);
+	}
+	y += fullHeight/2;
+    } else if (haveImage) {
+	int x = 0, y;
+
+	TkComputeAnchor(butPtr->anchor, tkwin, 0, 0,
+		butPtr->indicatorSpace + width, height, &x, &y);
+	x += butPtr->indicatorSpace;
+
+	x += dpPtr->offset;
+	y += dpPtr->offset;
+	if (dpPtr->relief == TK_RELIEF_RAISED) {
+	    x -= dpPtr->offset;
+	    y -= dpPtr->offset;
+	} else if (dpPtr->relief == TK_RELIEF_SUNKEN) {
+	    x += dpPtr->offset;
+	    y += dpPtr->offset;
+	}
+	imageXOffset += x;
+	imageYOffset += y;
+	if (butPtr->image != NULL) {
+	    if ((butPtr->selectImage != NULL) && (butPtr->flags & SELECTED)) {
+		Tk_RedrawImage(butPtr->selectImage, 0, 0, width, height,
+			pixmap, imageXOffset, imageYOffset);
+	    } else {
+		Tk_RedrawImage(butPtr->image, 0, 0, width, height,
+			pixmap, imageXOffset, imageYOffset);
+	    }
+	} else {
+	    XSetClipOrigin(butPtr->display, dpPtr->gc, x, y);
+	    XCopyPlane(butPtr->display, butPtr->bitmap, pixmap, dpPtr->gc,
+		    0, 0, width, height, x, y, 1);
+	    XSetClipOrigin(butPtr->display, dpPtr->gc, 0, 0);
+	}
+	y += height/2;
+    } else if (macButtonPtr->useTkText) {
+	int x = 0, y;
+
+	TkComputeAnchor(butPtr->anchor, tkwin, butPtr->padX, butPtr->padY,
+		butPtr->indicatorSpace + butPtr->textWidth,
+		butPtr->textHeight, &x, &y);
+	x += butPtr->indicatorSpace;
+	Tk_DrawTextLayout(butPtr->display, pixmap, dpPtr->gc,
+		butPtr->textLayout, x, y, 0, -1);
     }
 
     /*
      * If the button is disabled with a stipple rather than a special
-     * foreground color, generate the stippled effect.  If the widget
+     * foreground color, generate the stippled effect. If the widget
      * is selected and we use a different background color when selected,
      * must temporarily modify the GC so the stippling is the right color.
      */
 
+  applyStipple:
     if (macButtonPtr->useTkText) {
-        if ((butPtr->state == STATE_DISABLED)
-                && ((butPtr->disabledFg == NULL) || (butPtr->image != NULL))) {
-            if ((butPtr->flags & SELECTED) && !butPtr->indicatorOn
+	if ((butPtr->state == STATE_DISABLED)
+		&& ((butPtr->disabledFg == NULL) || (butPtr->image != NULL))) {
+	    if ((butPtr->flags & SELECTED) && !butPtr->indicatorOn
 		    && (butPtr->selectBorder != NULL)) {
-                XSetForeground(butPtr->display, butPtr->stippleGC,
+		XSetForeground(butPtr->display, butPtr->stippleGC,
 			Tk_3DBorderColor(butPtr->selectBorder)->pixel);
-            }
+	    }
+
 	    /*
 	     * Stipple the whole button if no disabledFg was specified,
 	     * otherwise restrict stippling only to displayed image
 	     */
+
 	    if (butPtr->disabledFg == NULL) {
 		XFillRectangle(butPtr->display, pixmap, butPtr->stippleGC,
 			0, 0, (unsigned) Tk_Width(tkwin),
@@ -477,24 +468,28 @@ TkpDisplayButton(
 			imageXOffset, imageYOffset,
 			(unsigned) imageWidth, (unsigned) imageHeight);
 	    }
-            if ((butPtr->flags & SELECTED) && !butPtr->indicatorOn
+	    if ((butPtr->flags & SELECTED) && !butPtr->indicatorOn
 		    && (butPtr->selectBorder != NULL)) {
 		XSetForeground(butPtr->display, butPtr->stippleGC,
 			Tk_3DBorderColor(butPtr->normalBorder)->pixel);
 	    }
-        }
-
-        /*
-         * Draw the border and traversal highlight last.  This way, if the
-         * button's contents overflow they'll be covered up by the border.
-         */
-         
-        if (dpPtr->relief != TK_RELIEF_FLAT) {
-            int inset = butPtr->highlightWidth;
-            Tk_Draw3DRectangle(tkwin, pixmap, dpPtr->border, inset, inset,
-                Tk_Width(tkwin) - 2*inset, Tk_Height(tkwin) - 2*inset,
-                butPtr->borderWidth, dpPtr->relief);
-        }
+	}
+
+	/*
+	 * Draw the border and traversal highlight last. This way, if the
+	 * button's contents overflow they'll be covered up by the border.
+	 */
+
+	if (dpPtr->relief != TK_RELIEF_FLAT) {
+	    int inset = butPtr->highlightWidth;
+
+	    Tk_Draw3DRectangle(tkwin, pixmap, dpPtr->border, inset, inset,
+		    Tk_Width(tkwin) - 2*inset, Tk_Height(tkwin) - 2*inset,
+		    butPtr->borderWidth, dpPtr->relief);
+	}
+    }
+    if (portChanged) {
+	QDSwapPort(savePort, NULL);
     }
 }
 
@@ -503,60 +498,58 @@ TkpDisplayButton(
  *
  * TkpComputeButtonGeometry --
  *
- *        After changes in a button's text or bitmap, this procedure
- *        recomputes the button's geometry and passes this information
- *        along to the geometry manager for the window.
+ *	After changes in a button's text or bitmap, this procedure
+ *	recomputes the button's geometry and passes this information
+ *	along to the geometry manager for the window.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        The button's window may change size.
+ *	The button's window may change size.
  *
  *----------------------------------------------------------------------
  */
 
 void
 TkpComputeButtonGeometry(
-    TkButton *butPtr)        /* Button whose geometry may have changed. */
+    TkButton *butPtr)		/* Button whose geometry may have changed. */
 {
     int width, height, avgWidth, haveImage = 0, haveText = 0;
-    int xInset, yInset;
-    int txtWidth, txtHeight;
+    int xInset, yInset, txtWidth, txtHeight;
     Tk_FontMetrics fm;
     DrawParams drawParams;
 
     /*
      * First figure out the size of the contents of the button.
      */
-     
+
     width = 0;
     height = 0;
     txtWidth = 0;
     txtHeight = 0;
     avgWidth = 0;
 
-     
     butPtr->indicatorSpace = 0;
     if (butPtr->image != NULL) {
-        Tk_SizeOfImage(butPtr->image, &width, &height);
-        haveImage = 1;
+	Tk_SizeOfImage(butPtr->image, &width, &height);
+	haveImage = 1;
     } else if (butPtr->bitmap != None) {
-        Tk_SizeOfBitmap(butPtr->display, butPtr->bitmap, &width, &height);
-        haveImage = 1;
+	Tk_SizeOfBitmap(butPtr->display, butPtr->bitmap, &width, &height);
+	haveImage = 1;
     }
 
     if (haveImage == 0 || butPtr->compound != COMPOUND_NONE) {
-        Tk_FreeTextLayout(butPtr->textLayout);
-        butPtr->textLayout = Tk_ComputeTextLayout(butPtr->tkfont,
-                Tcl_GetString(butPtr->textPtr), -1, butPtr->wrapLength,
-                butPtr->justify, 0, &butPtr->textWidth, &butPtr->textHeight);
-
-        txtWidth = butPtr->textWidth;
-        txtHeight = butPtr->textHeight;
-        avgWidth = Tk_TextWidth(butPtr->tkfont, "0", 1);
-        Tk_GetFontMetrics(butPtr->tkfont, &fm);
-        haveText = (txtWidth != 0 && txtHeight != 0);
+	Tk_FreeTextLayout(butPtr->textLayout);
+	butPtr->textLayout = Tk_ComputeTextLayout(butPtr->tkfont,
+		Tcl_GetString(butPtr->textPtr), -1, butPtr->wrapLength,
+		butPtr->justify, 0, &butPtr->textWidth, &butPtr->textHeight);
+
+	txtWidth = butPtr->textWidth;
+	txtHeight = butPtr->textHeight;
+	avgWidth = Tk_TextWidth(butPtr->tkfont, "0", 1);
+	Tk_GetFontMetrics(butPtr->tkfont, &fm);
+	haveText = (txtWidth != 0 && txtHeight != 0);
     }
 
     /*
@@ -567,172 +560,166 @@ TkpComputeButtonGeometry(
      */
 
     if (butPtr->compound != COMPOUND_NONE && haveImage && haveText) {
-        switch ((enum compound) butPtr->compound) {
-            case COMPOUND_TOP:
-            case COMPOUND_BOTTOM: {
-                /* 
-                 * Image is above or below text 
-                 */
-                 
-                height += txtHeight + butPtr->padY;
-                width = (width > txtWidth ? width : txtWidth);
-                break;
-            }
-            case COMPOUND_LEFT:
-            case COMPOUND_RIGHT: {
-                /* 
-                 * Image is left or right of text 
-                 */
-                  
-                width += txtWidth + butPtr->padX;
-                height = (height > txtHeight ? height : txtHeight);
-                break;
-            }
-            case COMPOUND_CENTER: {
-                /* 
-                 * Image and text are superimposed 
-                 */
-                 
-                width = (width > txtWidth ? width : txtWidth);
-                height = (height > txtHeight ? height : txtHeight);
-                break;
-            }
-            case COMPOUND_NONE: {break;}
-        }
-        if (butPtr->width > 0) {
-            width = butPtr->width;
-        }
-        if (butPtr->height > 0) {
-            height = butPtr->height;
-        }
-
-        if ((butPtr->type >= TYPE_CHECK_BUTTON) && butPtr->indicatorOn) {
-            butPtr->indicatorSpace = height;
-            if (butPtr->type == TYPE_CHECK_BUTTON) {
-                butPtr->indicatorDiameter = (65 * height)/100;
-            } else {
-                butPtr->indicatorDiameter = (75 * height)/100;
-            }
-        }
-
-        width += 2 * butPtr->padX;
-        height += 2 * butPtr->padY;
+	switch ((enum compound) butPtr->compound) {
+	    case COMPOUND_TOP:
+	    case COMPOUND_BOTTOM:
+		/*
+		 * Image is above or below text.
+		 */
+
+		height += txtHeight + butPtr->padY;
+		width = (width > txtWidth ? width : txtWidth);
+		break;
+	    case COMPOUND_LEFT:
+	    case COMPOUND_RIGHT:
+		/*
+		 * Image is left or right of text.
+		 */
+
+		width += txtWidth + butPtr->padX;
+		height = (height > txtHeight ? height : txtHeight);
+		break;
+	    case COMPOUND_CENTER:
+		/*
+		 * Image and text are superimposed.
+		 */
+
+		width = (width > txtWidth ? width : txtWidth);
+		height = (height > txtHeight ? height : txtHeight);
+		break;
+	    case COMPOUND_NONE:
+		break;
+	}
+	if (butPtr->width > 0) {
+	    width = butPtr->width;
+	}
+	if (butPtr->height > 0) {
+	    height = butPtr->height;
+	}
 
+	if ((butPtr->type >= TYPE_CHECK_BUTTON) && butPtr->indicatorOn) {
+	    butPtr->indicatorSpace = height;
+	    if (butPtr->type == TYPE_CHECK_BUTTON) {
+		butPtr->indicatorDiameter = (65 * height)/100;
+	    } else {
+		butPtr->indicatorDiameter = (75 * height)/100;
+	    }
+	}
+
+	width += 2 * butPtr->padX;
+	height += 2 * butPtr->padY;
+    } else if (haveImage) {
+	if (butPtr->width > 0) {
+	    width = butPtr->width;
+	}
+	if (butPtr->height > 0) {
+	    height = butPtr->height;
+	}
+	if ((butPtr->type >= TYPE_CHECK_BUTTON) && butPtr->indicatorOn) {
+	    butPtr->indicatorSpace = height;
+	    if (butPtr->type == TYPE_CHECK_BUTTON) {
+		butPtr->indicatorDiameter = (65 * height)/100;
+	    } else {
+		butPtr->indicatorDiameter = (75 * height)/100;
+	    }
+	}
     } else {
-        if (haveImage) {
-            if (butPtr->width > 0) {
-                width = butPtr->width;
-            }
-            if (butPtr->height > 0) {
-                height = butPtr->height;
-            }
-            if ((butPtr->type >= TYPE_CHECK_BUTTON) && butPtr->indicatorOn) {
-                butPtr->indicatorSpace = height;
-                if (butPtr->type == TYPE_CHECK_BUTTON) {
-                    butPtr->indicatorDiameter = (65 * height)/100;
-                } else {
-                    butPtr->indicatorDiameter = (75 * height)/100;
-                }
-            }
-        } else {
-            width = txtWidth;
-            height = txtHeight;
-            if (butPtr->width > 0) {
-                width = butPtr->width * avgWidth;
-            }
-            if (butPtr->height > 0) {
-                height = butPtr->height * fm.linespace;
-            }
-            if ((butPtr->type >= TYPE_CHECK_BUTTON) && butPtr->indicatorOn) {
-                butPtr->indicatorDiameter = fm.linespace;
-                if (butPtr->type == TYPE_CHECK_BUTTON) {
-                    butPtr->indicatorDiameter =
-                        (80 * butPtr->indicatorDiameter)/100;
-                }
-                butPtr->indicatorSpace = butPtr->indicatorDiameter + avgWidth;
-            }
-        }
+	width = txtWidth;
+	height = txtHeight;
+	if (butPtr->width > 0) {
+	    width = butPtr->width * avgWidth;
+	}
+	if (butPtr->height > 0) {
+	    height = butPtr->height * fm.linespace;
+	}
+	if ((butPtr->type >= TYPE_CHECK_BUTTON) && butPtr->indicatorOn) {
+	    butPtr->indicatorDiameter = fm.linespace;
+	    if (butPtr->type == TYPE_CHECK_BUTTON) {
+		butPtr->indicatorDiameter =
+			(80 * butPtr->indicatorDiameter)/100;
+	    }
+	    butPtr->indicatorSpace = butPtr->indicatorDiameter + avgWidth;
+	}
     }
 
     /*
      * Now figure out the size of the border decorations for the button.
      */
-     
+
     if (butPtr->highlightWidth < 0) {
-        butPtr->highlightWidth = 0;
+	butPtr->highlightWidth = 0;
     }
-    
+
     /*
-     * The width and height calculation for Appearance buttons with images & 
-     * non-Appearance buttons with images is different.         In the latter case, 
+     * The width and height calculation for Appearance buttons with images &
+     * non-Appearance buttons with images is different. In the latter case,
      * we add the borderwidth to the inset, since we are going to stamp a
-     * 3-D border over the image.  In the former, we add it to the height,
+     * 3-D border over the image. In the former, we add it to the height,
      * directly, since Appearance will draw the border as part of our control.
      *
      * When issuing the geometry request, add extra space for the indicator,
-     * if any, and for the border and padding, plus if this is an image two 
+     * if any, and for the border and padding, plus if this is an image two
      * extra pixels so the display can be offset by 1 pixel in either
      * direction for the raised or lowered effect.
      *
      * The highlight width corresponds to the default ring on the Macintosh.
      * As such, the highlight width is only added if the button is the default
-     * button.        The actual width of the default ring is one less than the
+     * button. The actual width of the default ring is one less than the
      * highlight width as there is also one pixel of spacing.
-     * Appearance buttons with images do not have a highlight ring, because the 
+     * Appearance buttons with images do not have a highlight ring, because the
      * Bevel button type does not support one.
      */
 
     if ((butPtr->image == None) && (butPtr->bitmap == None)) {
-        width += 2*butPtr->padX;
-        height += 2*butPtr->padY;
+	width += 2*butPtr->padX;
+	height += 2*butPtr->padY;
     }
-    
+
     if ((butPtr->type == TYPE_BUTTON)) {
-        if ((butPtr->image == None) && (butPtr->bitmap == None)) {
-            butPtr->inset = 0;
-            if (butPtr->defaultState != STATE_DISABLED) {
-                butPtr->inset += butPtr->highlightWidth;
-            }
-        } else  {
-            butPtr->inset = 0;
-            width += (2 * butPtr->borderWidth + 4);
-            height += (2 * butPtr->borderWidth + 4);
-        }
-    } else if ((butPtr->type != TYPE_LABEL)) {
-        if (butPtr->indicatorOn) {
-            butPtr->inset = 0;
-        } else {
-            /*
-             * Under Appearance, the Checkbutton or radiobutton with an image
-             * is represented by a BevelButton with the Sticky defProc...  
-             * So we must set its height in the same way as the Button 
-             * with an image or bitmap.
-             */
-             
-            if ( (butPtr->image != None) || (butPtr->bitmap != None)) {
-                int border;
-                butPtr->inset = 0;
-                if ( butPtr->borderWidth <= 2 ) {
-                    border = 6;
-                }  else {
-                    border = 2 * butPtr->borderWidth + 2;
-                }               
-                width += border;
-                height += border;
-            } else {
-                butPtr->inset = butPtr->borderWidth;
-            }        
-        }        
+	if ((butPtr->image == None) && (butPtr->bitmap == None)) {
+	    butPtr->inset = 0;
+	    if (butPtr->defaultState != STATE_DISABLED) {
+		butPtr->inset += butPtr->highlightWidth;
+	    }
+	} else {
+	    butPtr->inset = 0;
+	    width += (2 * butPtr->borderWidth + 4);
+	    height += (2 * butPtr->borderWidth + 4);
+	}
+    } else if (butPtr->type == TYPE_LABEL) {
+	butPtr->inset = butPtr->borderWidth;
+    } else if (butPtr->indicatorOn) {
+	butPtr->inset = 0;
     } else {
-        butPtr->inset = butPtr->borderWidth;
+	/*
+	 * Under Appearance, the Checkbutton or radiobutton with an image
+	 * is represented by a BevelButton with the Sticky defProc...
+	 * So we must set its height in the same way as the Button
+	 * with an image or bitmap.
+	 */
+
+	if (butPtr->image != None || butPtr->bitmap != None) {
+	    int border;
+
+	    butPtr->inset = 0;
+	    if (butPtr->borderWidth <= 2) {
+		border = 6;
+	    } else {
+		border = 2 * butPtr->borderWidth + 2;
+	    }
+	    width += border;
+	    height += border;
+	} else {
+	    butPtr->inset = butPtr->borderWidth;
+	}
     }
 
     if (TkMacOSXComputeDrawParams(butPtr,&drawParams)) {
-        xInset = butPtr->indicatorSpace + DEF_INSET_LEFT + DEF_INSET_RIGHT;
-        yInset = DEF_INSET_TOP + DEF_INSET_BOTTOM;
+	xInset = butPtr->indicatorSpace + DEF_INSET_LEFT + DEF_INSET_RIGHT;
+	yInset = DEF_INSET_TOP + DEF_INSET_BOTTOM;
     } else {
-        xInset = butPtr->indicatorSpace+butPtr->inset*2;
-        yInset = butPtr->inset*2;
+	xInset = butPtr->indicatorSpace+butPtr->inset*2;
+	yInset = butPtr->inset*2;
     }
     Tk_GeometryRequest(butPtr->tkwin, width + xInset, height + yInset);
     Tk_SetInternalBorder(butPtr->tkwin, butPtr->inset);
@@ -743,13 +730,13 @@ TkpComputeButtonGeometry(
  *
  * TkpDestroyButton --
  *
- *        Free data structures associated with the button control.
+ *	Free data structures associated with the button control.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        Restores the default control state.
+ *	Restores the default control state.
  *
  *----------------------------------------------------------------------
  */
@@ -758,10 +745,11 @@ void
 TkpDestroyButton(
     TkButton *butPtr)
 {
-    MacButton *mbPtr = ( MacButton *) butPtr; /* Mac button. */
+    MacButton *mbPtr = (MacButton *) butPtr; /* Mac button. */
+
     if (mbPtr->userPane) {
-        DisposeControl(mbPtr->userPane);
-        mbPtr->userPane = NULL;
+	DisposeControl(mbPtr->userPane);
+	mbPtr->userPane = NULL;
     }
 }
 
@@ -770,244 +758,212 @@ TkpDestroyButton(
  *
  * TkMacOSXInitControl --
  *
- *        This procedure initialises a Carbon control
+ *	This procedure initialises a Carbon control.
  *
  * Results:
- *        0 on success, 1 on failure.
+ *	0 on success, 1 on failure.
  *
  * Side effects:
- *        A background pane control and the control itself is created
- *      The contol is embedded in the background control
- *      The background control is embedded in the root control
- *      of the containing window
- *      The creation parameters for the control are also computed
+ *	A background pane control and the control itself is created
+ *	The contol is embedded in the background control
+ *	The background control is embedded in the root control
+ *	of the containing window
+ *	The creation parameters for the control are also computed
  *
  *----------------------------------------------------------------------
  */
 
 static int
-TkMacOSXInitControl (
-    MacButton *mbPtr,                /* Mac button. */
-    GWorldPtr  destPort,
-    GC         gc,
-    Pixmap     pixmap,
-    Rect      *paneRect,
-    Rect      *cntrRect
-)
+TkMacOSXInitControl(
+    MacButton *mbPtr,		/* Mac button. */
+    GWorldPtr destPort,
+    GC gc,
+    Pixmap pixmap,
+    Rect *paneRect,
+    Rect *cntrRect)
 {
-    OSErr      status;
-    TkButton * butPtr = ( TkButton * )mbPtr;
+    TkButton *butPtr = (TkButton *) mbPtr;
     ControlRef rootControl;
-    SInt16     procID;
-    Boolean    initiallyVisible;
-    SInt16     initialValue;
-    SInt16     minValue;
-    SInt16     maxValue;
-    SInt32     controlReference;
+    SInt16 procID, initialValue, minValue, maxValue;
+    Boolean initiallyVisible;
+    SInt32 controlReference;
 
     rootControl = TkMacOSXGetRootControl(Tk_WindowId(butPtr->tkwin));
-    mbPtr->windowRef
-            = GetWindowFromPort(TkMacOSXGetDrawablePort(Tk_WindowId(butPtr->tkwin)));
+    mbPtr->windowRef = GetWindowFromPort(
+	    TkMacOSXGetDrawablePort(Tk_WindowId(butPtr->tkwin)));
 
-    /* 
-     * Set up the user pane
+    /*
+     * Set up the user pane.
      */
 
     initiallyVisible = false;
-    initialValue     = kControlSupportsEmbedding|kControlHasSpecialBackground;
-    minValue         = 0;
-    maxValue         = 1;
-    procID           = kControlUserPaneProc;
+    initialValue = kControlSupportsEmbedding|kControlHasSpecialBackground;
+    minValue = 0;
+    maxValue = 1;
+    procID = kControlUserPaneProc;
     controlReference = (SInt32)mbPtr;
-    mbPtr->userPane  = NewControl(mbPtr->windowRef,
-        paneRect, "\p",
-        initiallyVisible,
-        initialValue,
-        minValue,
-        maxValue,
-        procID,
-        controlReference );
-        
+    mbPtr->userPane = NewControl(mbPtr->windowRef, paneRect, "\p",
+	    initiallyVisible, initialValue, minValue, maxValue, procID,
+	    controlReference);
+
     if (!mbPtr->userPane) {
-#ifdef TK_MAC_DEBUG
-        fprintf(stderr,"Failed to create user pane control\n");
-#endif
-        return 1;
+	TkMacOSXDbgMsg("Failed to create user pane control");
+	return 1;
     }
-    
-    if ((status = EmbedControl(mbPtr->userPane,rootControl)) != noErr) {
-#ifdef TK_MAC_DEBUG
-        fprintf(stderr,"Failed to embed user pane control %d\n", status);
-#endif
-        return 1;
+    if (ChkErr(EmbedControl, mbPtr->userPane,rootControl) != noErr) {
+	return 1;
     }
-    
+
     SetUserPaneSetUpSpecialBackgroundProc(mbPtr->userPane,
-        UserPaneBackgroundProc);
+	    UserPaneBackgroundProc);
     SetUserPaneDrawProc(mbPtr->userPane,UserPaneDraw);
     initiallyVisible = false;
     TkMacOSXComputeControlParams(butPtr,&mbPtr->params);
-    mbPtr->control = NewControl(mbPtr->windowRef,
-        cntrRect, "\p",
-        initiallyVisible,
-        mbPtr->params.initialValue,
-        mbPtr->params.minValue,
-        mbPtr->params.maxValue,
-        mbPtr->params.procID,
-        controlReference );
-        
+    mbPtr->control = NewControl(mbPtr->windowRef, cntrRect, "\p",
+	    initiallyVisible, mbPtr->params.initialValue,
+	    mbPtr->params.minValue, mbPtr->params.maxValue,
+	    mbPtr->params.procID, controlReference);
+
     if (!mbPtr->control) {
-#ifdef TK_MAC_DEBUG
-        fprintf(stderr,"failed to create control of type %d\n",procID);
-#endif
-        return 1;
+	TkMacOSXDbgMsg("failed to create control of type %d\n", procID);
+	return 1;
     }
-    
-    if (EmbedControl(mbPtr->control,mbPtr->userPane) != noErr ) {
-#ifdef TK_MAC_DEBUG
-        fprintf(stderr,"failed to embed control of type %d\n",procID);
-#endif
-        return 1;
+    if (ChkErr(EmbedControl, mbPtr->control,mbPtr->userPane) != noErr ) {
+	return 1;
     }
-    
+
     mbPtr->flags |= (1 + 2);
     return 0;
 }
-
+
 /*
  *--------------------------------------------------------------
  *
  * TkMacOSXDrawControl --
  *
- *        This function draws the tk button using Mac controls
- *        In addition, this code may apply custom colors passed 
- *        in the TkButton.
+ *	This function draws the tk button using Mac controls
+ *	In addition, this code may apply custom colors passed
+ *	in the TkButton.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *      The control is created, or reinitialised as needed
- *
+ *	The control is created, or reinitialised as needed.
  *
  *--------------------------------------------------------------
  */
 
 static void
 TkMacOSXDrawControl(
-    MacButton *mbPtr,    /* Mac button. */
-    GWorldPtr destPort,  /* Off screen GWorld. */
-    GC gc,               /* The GC we are drawing into - needed for
-                          * the bevel button */
-    Pixmap pixmap)       /* The pixmap we are drawing into - needed
-                          * for the bevel button */
-                
+    MacButton *mbPtr,		/* Mac button. */
+    GWorldPtr destPort,		/* Off screen GWorld. */
+    GC gc,			/* The GC we are drawing into - needed for the
+				 * bevel button */
+    Pixmap pixmap)		/* The pixmap we are drawing into - needed for
+				 * the bevel button */
 {
-    TkButton * butPtr = ( TkButton *)mbPtr;
-    int        err;
-    TkWindow * winPtr;
-    Rect       paneRect;
-    Rect       cntrRect;
-
-    winPtr = (TkWindow *)butPtr->tkwin;
-   
-    paneRect.left   = winPtr->privatePtr->xOff;
-    paneRect.top    = winPtr->privatePtr->yOff;
-    paneRect.right  = paneRect.left + Tk_Width(butPtr->tkwin);
+    TkButton *butPtr = (TkButton *) mbPtr;
+    TkWindow *winPtr;
+    Rect paneRect, cntrRect;
+
+    winPtr = (TkWindow *) butPtr->tkwin;
+
+    paneRect.left = winPtr->privatePtr->xOff;
+    paneRect.top = winPtr->privatePtr->yOff;
+    paneRect.right = paneRect.left + Tk_Width(butPtr->tkwin);
     paneRect.bottom = paneRect.top + Tk_Height(butPtr->tkwin);
 
     cntrRect = paneRect;
 
 /*
-    cntrRect.left   += butPtr->inset;
-    cntrRect.top    += butPtr->inset;
-    cntrRect.right  -= butPtr->inset;
+    cntrRect.left += butPtr->inset;
+    cntrRect.top += butPtr->inset;
+    cntrRect.right -= butPtr->inset;
     cntrRect.bottom -= butPtr->inset;
 */
-    cntrRect.left   += DEF_INSET_LEFT;
-    cntrRect.top    += DEF_INSET_TOP;
-    cntrRect.right  -= DEF_INSET_RIGHT;
+    cntrRect.left += DEF_INSET_LEFT;
+    cntrRect.top += DEF_INSET_TOP;
+    cntrRect.right -= DEF_INSET_RIGHT;
     cntrRect.bottom -= DEF_INSET_BOTTOM;
 
-    /* 
-     * The control has been previously initialised
-     * It may need to be re-initialised 
+    /*
+     * The control has been previously initialised.
+     * It may need to be re-initialised
      */
-     
+
     if (mbPtr->flags) {
-        MacControlParams params;
-        TkMacOSXComputeControlParams(butPtr, &params);
-        if (bcmp(&params, &mbPtr->params, sizeof(params))) {
-            /* 
-             * the type of control has changed
-             * Clean it up and clear the flag 
-             */
-             
-            if (mbPtr->userPane) {
-                DisposeControl(mbPtr->userPane);
-                mbPtr->userPane = NULL;
-                mbPtr->control = NULL;
-            }
-            mbPtr->flags = 0;
-        }
+	MacControlParams params;
+
+	TkMacOSXComputeControlParams(butPtr, &params);
+	if (bcmp(&params, &mbPtr->params, sizeof(params))) {
+	    /*
+	     * The type of control has changed.
+	     * Clean it up and clear the flag.
+	     */
+
+	    if (mbPtr->userPane) {
+		DisposeControl(mbPtr->userPane);
+		mbPtr->userPane = NULL;
+		mbPtr->control = NULL;
+	    }
+	    mbPtr->flags = 0;
+	}
     }
     if (!(mbPtr->flags & 1)) {
-        if (TkMacOSXInitControl(mbPtr, destPort, gc, 
-                pixmap, &paneRect, &cntrRect) ) {
-            return;
-        }
+	if (TkMacOSXInitControl(mbPtr, destPort, gc, pixmap, &paneRect,
+		&cntrRect)) {
+	    return;
+	}
     }
     SetControlBounds(mbPtr->userPane, &paneRect);
     SetControlBounds(mbPtr->control, &cntrRect);
 
     if (!mbPtr->useTkText) {
-        Str255              controlTitle;
-        ControlFontStyleRec fontStyle;
-        Tk_Font    font;
-        int        len;
-        
-        if (((mbPtr->info.image == NULL) && (mbPtr->info.bitmap == None))
-               || (mbPtr->info.compound != COMPOUND_NONE)) {
-            len = TkFontGetFirstTextLayout(butPtr->textLayout, 
-                    &font, (char*) controlTitle);
-            controlTitle[len] = 0;
-        } else {
-            len = 0;
-            controlTitle[0] = 0;
-        }
-        if (bcmp(mbPtr->controlTitle, controlTitle, len+1)) {
-            CFStringRef cf;    	    
-            cf = CFStringCreateWithCString(NULL,
-                  (char*) controlTitle, kCFStringEncodingUTF8);
-            if (cf != NULL) {
-            SetControlTitleWithCFString(mbPtr->control, cf);
-            CFRelease(cf);
-            }
-            bcopy(controlTitle, mbPtr->controlTitle, len+1);
-        }
-        if (len) {
-            TkMacOSXInitControlFontStyle(font, &fontStyle);
-            if (bcmp(&mbPtr->fontStyle, &fontStyle, sizeof(fontStyle)) ) {
-                if (SetControlFontStyle(mbPtr->control, &fontStyle) != noErr) {
-#ifdef TK_MAC_DEBUG
-                    fprintf(stderr,"SetControlFontStyle failed\n");
-#endif
-                }
-                bcopy(&fontStyle, &mbPtr->fontStyle, 
-                        sizeof(fontStyle));
-            }
-        }
+	Str255 controlTitle;
+	ControlFontStyleRec fontStyle;
+	Tk_Font font;
+	int len;
+
+	if (((mbPtr->info.image == NULL) && (mbPtr->info.bitmap == None))
+		|| (mbPtr->info.compound != COMPOUND_NONE)) {
+	    len = TkFontGetFirstTextLayout(butPtr->textLayout,
+		    &font, (char*) controlTitle);
+	    controlTitle[len] = 0;
+	} else {
+	    len = 0;
+	    controlTitle[0] = 0;
+	}
+	if (bcmp(mbPtr->controlTitle, controlTitle, len+1)) {
+	    CFStringRef cf = CFStringCreateWithCString(NULL,
+		    (char*) controlTitle, kCFStringEncodingUTF8);
+
+	    if (cf != NULL) {
+		SetControlTitleWithCFString(mbPtr->control, cf);
+		CFRelease(cf);
+	    }
+	    bcopy(controlTitle, mbPtr->controlTitle, len+1);
+	}
+	if (len) {
+	    TkMacOSXInitControlFontStyle(font, &fontStyle);
+	    if (bcmp(&mbPtr->fontStyle, &fontStyle, sizeof(fontStyle)) ) {
+		ChkErr(SetControlFontStyle, mbPtr->control, &fontStyle);
+		bcopy(&fontStyle, &mbPtr->fontStyle, sizeof(fontStyle));
+	    }
+	}
     }
     if (mbPtr->params.isBevel) {
-        /* Initialiase the image/button parameters */
-        SetupBevelButton(mbPtr, mbPtr->control, destPort, 
-                      gc, pixmap);
+	/*
+	 * Initialiase the image/button parameters.
+	 */
+
+	SetupBevelButton(mbPtr, mbPtr->control, destPort, gc, pixmap);
     }
 
     if (butPtr->flags & SELECTED) {
-     SetControlValue(mbPtr->control, 1);
+	SetControlValue(mbPtr->control, 1);
     } else {
-     SetControlValue(mbPtr->control, 0);
+	SetControlValue(mbPtr->control, 0);
     }
 
     if (!Tk_MacOSXIsAppInFront() || butPtr->state == STATE_DISABLED) {
@@ -1017,6 +973,7 @@ TkMacOSXDrawControl(
 	 * Use NoPart for normal and to ensure correct direct transition from
 	 * disabled to active -state. [Bug 706446]
 	 */
+
 	HiliteControl(mbPtr->control, kControlNoPart);
 
 	if (butPtr->state == STATE_ACTIVE) {
@@ -1025,7 +982,7 @@ TkMacOSXDrawControl(
 	    } else {
 		switch (butPtr->type) {
 		    case TYPE_BUTTON:
-			HiliteControl(mbPtr->control,  kControlButtonPart);
+			HiliteControl(mbPtr->control, kControlButtonPart);
 			break;
 		    case TYPE_RADIO_BUTTON:
 			HiliteControl(mbPtr->control, kControlRadioButtonPart);
@@ -1039,31 +996,29 @@ TkMacOSXDrawControl(
     }
     UpdateControlColors(mbPtr);
 
-    if (butPtr->type == TYPE_BUTTON) {
-        Boolean isDefault;
-
-        if (butPtr->defaultState == STATE_ACTIVE) {
-            isDefault = true;
-        } else {
-            isDefault = false;
-        }
-        if ((err=SetControlData(mbPtr->control, kControlNoPart, 
-                kControlPushButtonDefaultTag,
-                sizeof(isDefault), (Ptr) &isDefault)) != noErr) {
-        }
+    if (butPtr->type == TYPE_BUTTON && !mbPtr->params.isBevel) {
+	Boolean isDefault;
+
+	if (butPtr->defaultState == STATE_ACTIVE) {
+	    isDefault = true;
+	} else {
+	    isDefault = false;
+	}
+	ChkErr(SetControlData, mbPtr->control, kControlNoPart,
+		kControlPushButtonDefaultTag, sizeof(isDefault), &isDefault);
     }
 
-    if (mbPtr->flags&2) {
-        ShowControl(mbPtr->userPane);
-        ShowControl(mbPtr->control);
-        mbPtr->flags ^= 2;
+    if (mbPtr->flags & 2) {
+	ShowControl(mbPtr->userPane);
+	ShowControl(mbPtr->control);
+	mbPtr->flags ^= 2;
     } else {
-        SetControlVisibility(mbPtr->control, true, true);
-        Draw1Control(mbPtr->userPane);
+	SetControlVisibility(mbPtr->control, true, true);
+	Draw1Control(mbPtr->userPane);
     }
 
     if (mbPtr->params.isBevel) {
-        KillPicture(mbPtr->bevelButtonContent.u.picture);
+	KillPicture(mbPtr->bevelButtonContent.u.picture);
     }
 }
 
@@ -1072,147 +1027,128 @@ TkMacOSXDrawControl(
  *
  * SetupBevelButton --
  *
- *        Sets up the Bevel Button with image by copying the
- *        source image onto the PicHandle for the button.
+ *	Sets up the Bevel Button with image by copying the
+ *	source image onto the PicHandle for the button.
  *
  * Results:
- *        None
+ *	None
  *
  * Side effects:
- *        The image or bitmap for the button is copied over to a picture.
+ *	The image or bitmap for the button is copied over to a picture.
  *
  *--------------------------------------------------------------
  */
+
 void
 SetupBevelButton(
-    MacButton *mbPtr,                /* Mac button. */
-    ControlRef controlHandle,         /* The control to set this picture to */
-    GWorldPtr destPort,                /* Off screen GWorld. */
-    GC gc,                        /* The GC we are drawing into - needed for
-                                 * the bevel button */
-    Pixmap pixmap                /* The pixmap we are drawing into - needed
-                                   for the bevel button */
-    )
+    MacButton *mbPtr,		/* Mac button. */
+    ControlRef controlHandle,	/* The control to set this picture to. */
+    GWorldPtr destPort,		/* Off screen GWorld. */
+    GC gc,			/* The GC we are drawing into - needed for the
+				 * bevel button. */
+    Pixmap pixmap)		/* The pixmap we are drawing into - needed for
+				 * the bevel button. */
 {
-    int       err;
-    TkButton *butPtr = ( TkButton *)mbPtr;
+    TkButton *butPtr = (TkButton *) mbPtr;
     int height, width;
     ControlButtonGraphicAlignment theAlignment;
-    
-    SetPort(destPort);
+    CGrafPtr savePort;
+    Boolean portChanged;
+
+    portChanged = QDSwapPort(destPort, &savePort);
 
     if (butPtr->image != None) {
-        Tk_SizeOfImage(butPtr->image, 
-                &width, &height);
+	Tk_SizeOfImage(butPtr->image, &width, &height);
     } else {
-        Tk_SizeOfBitmap(butPtr->display, butPtr->bitmap, 
-                &width, &height);
+	Tk_SizeOfBitmap(butPtr->display, butPtr->bitmap, &width, &height);
     }
-            
+
     if ((butPtr->width > 0) && (butPtr->width < width)) {
-        width = butPtr->width;
+	width = butPtr->width;
     }
     if ((butPtr->height > 0) && (butPtr->height < height)) {
-        height = butPtr->height;
+	height = butPtr->height;
     }
 
     mbPtr->picParams.srcRect.right = width;
     mbPtr->picParams.srcRect.bottom = height;
 
-    /* 
-     * Set the flag to circumvent clipping and bounds problems with OS 10.0.4 
+    /*
+     * Set the flag to circumvent clipping and bounds problems with OS 10.0.4
      */
-     
-    if (!(mbPtr->bevelButtonContent.u.picture 
-            = OpenCPicture(&mbPtr->picParams)) ) {
-#ifdef TK_MAC_DEBUG
-        fprintf(stderr,"OpenCPicture failed\n");
-#endif
+
+    mbPtr->bevelButtonContent.u.picture = OpenCPicture(&mbPtr->picParams);
+    if (!mbPtr->bevelButtonContent.u.picture) {
+	TkMacOSXDbgMsg("OpenCPicture failed");
     }
     tkPictureIsOpen = 1;
-    
+
     /*
      * TO DO - There is one case where XCopyPlane calls CopyDeepMask,
-     * which does not get recorded in the picture.  So the bitmap code
+     * which does not get recorded in the picture. So the bitmap code
      * will fail in that case.
      */
-     
-    if ((butPtr->selectImage != NULL) && (butPtr->flags & SELECTED)) {
-        Tk_RedrawImage(butPtr->selectImage, 0, 0, width, height,
-                pixmap, 0, 0);
+
+    if (butPtr->selectImage != NULL && (butPtr->flags & SELECTED)) {
+	Tk_RedrawImage(butPtr->selectImage, 0, 0, width, height, pixmap, 0, 0);
     } else if (butPtr->image != NULL) {
-        Tk_RedrawImage(butPtr->image, 0, 0, width, 
-                height, pixmap, 0, 0);
-    } else {                        
-        XSetClipOrigin(butPtr->display, gc, 0, 0);
-        XCopyPlane(butPtr->display, butPtr->bitmap, pixmap, gc, 0, 0,
-                (unsigned int) width, (unsigned int) height, 0, 0, 1);
+	Tk_RedrawImage(butPtr->image, 0, 0, width, height, pixmap, 0, 0);
+    } else {
+	XSetClipOrigin(butPtr->display, gc, 0, 0);
+	XCopyPlane(butPtr->display, butPtr->bitmap, pixmap, gc, 0, 0, width,
+		height, 0, 0, 1);
     }
-    
+
     ClosePicture();
     tkPictureIsOpen = 0;
-    
-    if ((err = SetControlData(controlHandle, kControlButtonPart,
-            kControlBevelButtonContentTag,
-            sizeof(ControlButtonContentInfo),
-            (char *) &mbPtr->bevelButtonContent)) != noErr) {
-#ifdef TK_MAC_DEBUG
-        fprintf(stderr,
-                "SetControlData BevelButtonContent failed, %d\n", err );
-#endif
-    }
-            
+
+    ChkErr(SetControlData, controlHandle, kControlButtonPart,
+	    kControlBevelButtonContentTag, sizeof(ControlButtonContentInfo),
+	    (char *) &mbPtr->bevelButtonContent);
+
     if (butPtr->anchor == TK_ANCHOR_N) {
-        theAlignment = kControlBevelButtonAlignTop;
-    } else if (butPtr->anchor == TK_ANCHOR_NE) { 
-        theAlignment = kControlBevelButtonAlignTopRight;
-    } else if (butPtr->anchor == TK_ANCHOR_E) { 
-        theAlignment = kControlBevelButtonAlignRight;
+	theAlignment = kControlBevelButtonAlignTop;
+    } else if (butPtr->anchor == TK_ANCHOR_NE) {
+	theAlignment = kControlBevelButtonAlignTopRight;
+    } else if (butPtr->anchor == TK_ANCHOR_E) {
+	theAlignment = kControlBevelButtonAlignRight;
     } else if (butPtr->anchor == TK_ANCHOR_SE) {
-        theAlignment = kControlBevelButtonAlignBottomRight;
+	theAlignment = kControlBevelButtonAlignBottomRight;
     } else if (butPtr->anchor == TK_ANCHOR_S) {
-        theAlignment = kControlBevelButtonAlignBottom;
+	theAlignment = kControlBevelButtonAlignBottom;
     } else if (butPtr->anchor == TK_ANCHOR_SW) {
-        theAlignment = kControlBevelButtonAlignBottomLeft;
+	theAlignment = kControlBevelButtonAlignBottomLeft;
     } else if (butPtr->anchor == TK_ANCHOR_W) {
-        theAlignment = kControlBevelButtonAlignLeft;
+	theAlignment = kControlBevelButtonAlignLeft;
     } else if (butPtr->anchor == TK_ANCHOR_NW) {
-        theAlignment = kControlBevelButtonAlignTopLeft;
+	theAlignment = kControlBevelButtonAlignTopLeft;
     } else if (butPtr->anchor == TK_ANCHOR_CENTER) {
-        theAlignment = kControlBevelButtonAlignCenter;
+	theAlignment = kControlBevelButtonAlignCenter;
     }
 
-    if ((err = SetControlData(controlHandle, kControlButtonPart,
-            kControlBevelButtonGraphicAlignTag,
-            sizeof(ControlButtonGraphicAlignment),
-            (char *) &theAlignment)) != noErr) {
-#ifdef TK_MAC_DEBUG
-        fprintf(stderr,
-                "SetControlData BevelButtonGraphicAlign failed, %d\n", err );
-#endif
-    }
+    ChkErr(SetControlData, controlHandle, kControlButtonPart,
+	    kControlBevelButtonGraphicAlignTag,
+	    sizeof(ControlButtonGraphicAlignment), (char *) &theAlignment);
 
     if (butPtr->compound != COMPOUND_NONE) {
-        ControlButtonTextPlacement thePlacement = \
-                kControlBevelButtonPlaceNormally;
-        if (butPtr->compound == COMPOUND_TOP) {
-            thePlacement = kControlBevelButtonPlaceBelowGraphic;
-        } else if (butPtr->compound == COMPOUND_BOTTOM) {
-            thePlacement = kControlBevelButtonPlaceAboveGraphic;
-        } else if (butPtr->compound == COMPOUND_LEFT) {
-            thePlacement = kControlBevelButtonPlaceToRightOfGraphic;
-        } else if (butPtr->compound == COMPOUND_RIGHT) {
-            thePlacement = kControlBevelButtonPlaceToLeftOfGraphic;
-        }
-        if ((err = SetControlData(controlHandle, kControlButtonPart,
-                kControlBevelButtonTextPlaceTag,
-                sizeof(ControlButtonTextPlacement),
-                (char *) &thePlacement)) != noErr) {
-#ifdef TK_MAC_DEBUG
-            fprintf(stderr,
-                    "SetControlData BevelButtonTextPlace failed, %d\n", err );
-#endif
-        }
+	ControlButtonTextPlacement thePlacement =
+		kControlBevelButtonPlaceNormally;
+
+	if (butPtr->compound == COMPOUND_TOP) {
+	    thePlacement = kControlBevelButtonPlaceBelowGraphic;
+	} else if (butPtr->compound == COMPOUND_BOTTOM) {
+	    thePlacement = kControlBevelButtonPlaceAboveGraphic;
+	} else if (butPtr->compound == COMPOUND_LEFT) {
+	    thePlacement = kControlBevelButtonPlaceToRightOfGraphic;
+	} else if (butPtr->compound == COMPOUND_RIGHT) {
+	    thePlacement = kControlBevelButtonPlaceToLeftOfGraphic;
+	}
+	ChkErr(SetControlData, controlHandle, kControlButtonPart,
+		kControlBevelButtonTextPlaceTag,
+		sizeof(ControlButtonTextPlacement), (char *) &thePlacement);
+    }
+    if (portChanged) {
+	QDSwapPort(savePort, NULL);
     }
 }
 
@@ -1221,28 +1157,30 @@ SetupBevelButton(
  *
  * SetUserPaneDrawProc --
  *
- *        Utility function to add a UserPaneDrawProc
- *        to a userPane control.        From MoreControls code
- *        from Apple DTS.
+ *	Utility function to add a UserPaneDrawProc
+ *	to a userPane control. From MoreControls code
+ *	from Apple DTS.
  *
  * Results:
- *        MacOS system error.
+ *	MacOS system error.
  *
  * Side effects:
- *        The user pane gets a new UserPaneDrawProc.
+ *	The user pane gets a new UserPaneDrawProc.
  *
  *--------------------------------------------------------------
  */
-OSErr SetUserPaneDrawProc (
+
+OSStatus
+SetUserPaneDrawProc(
     ControlRef control,
     ControlUserPaneDrawProcPtr upp)
 {
     ControlUserPaneDrawUPP myControlUserPaneDrawUPP;
-    myControlUserPaneDrawUPP = NewControlUserPaneDrawUPP(upp);        
-    return SetControlData (control, 
-            kControlNoPart, kControlUserPaneDrawProcTag, 
-            sizeof(myControlUserPaneDrawUPP), 
-            (Ptr) &myControlUserPaneDrawUPP);
+
+    myControlUserPaneDrawUPP = NewControlUserPaneDrawUPP(upp);
+    return SetControlData(control, kControlNoPart,
+	    kControlUserPaneDrawProcTag, sizeof(myControlUserPaneDrawUPP),
+	    (Ptr) &myControlUserPaneDrawUPP);
 }
 
 /*
@@ -1250,28 +1188,30 @@ OSErr SetUserPaneDrawProc (
  *
  * SetUserPaneSetUpSpecialBackgroundProc --
  *
- *        Utility function to add a UserPaneBackgroundProc
- *        to a userPane control
+ *	Utility function to add a UserPaneBackgroundProc
+ *	to a userPane control
  *
  * Results:
- *        MacOS system error.
+ *	MacOS system error.
  *
  * Side effects:
- *        The user pane gets a new UserPaneBackgroundProc.
+ *	The user pane gets a new UserPaneBackgroundProc.
  *
  *--------------------------------------------------------------
  */
-OSErr
+
+OSStatus
 SetUserPaneSetUpSpecialBackgroundProc(
-    ControlRef control, 
+    ControlRef control,
     ControlUserPaneBackgroundProcPtr upp)
 {
     ControlUserPaneBackgroundUPP myControlUserPaneBackgroundUPP;
+
     myControlUserPaneBackgroundUPP = NewControlUserPaneBackgroundUPP(upp);
-    return SetControlData (control, kControlNoPart, 
-            kControlUserPaneBackgroundProcTag, 
-            sizeof(myControlUserPaneBackgroundUPP), 
-            (Ptr) &myControlUserPaneBackgroundUPP);
+    return SetControlData(control, kControlNoPart,
+	    kControlUserPaneBackgroundProcTag,
+	    sizeof(myControlUserPaneBackgroundUPP),
+	    (Ptr) &myControlUserPaneBackgroundUPP);
 }
 
 /*
@@ -1279,28 +1219,29 @@ SetUserPaneSetUpSpecialBackgroundProc(
  *
  * UserPaneDraw --
  *
- *        This function draws the background of the user pane that will 
- *        lie under checkboxes and radiobuttons.
+ *	This function draws the background of the user pane that will
+ *	lie under checkboxes and radiobuttons.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        The user pane gets updated to the current color.
+ *	The user pane gets updated to the current color.
  *
  *--------------------------------------------------------------
  */
+
 void
 UserPaneDraw(
     ControlRef control,
     ControlPartCode cpc)
 {
+    MacButton *mbPtr = (MacButton *)(intptr_t)GetControlReference(control);
     Rect contrlRect;
-    MacButton * mbPtr;
-    mbPtr = ( MacButton *)GetControlReference(control);
+
     GetControlBounds(control,&contrlRect);
-    RGBBackColor (&mbPtr->userPaneBackground);
-    EraseRect (&contrlRect);
+    TkMacOSXSetColorInPort(mbPtr->userPaneBackground, 0, NULL);
+    EraseRect(&contrlRect);
 }
 
 /*
@@ -1308,14 +1249,14 @@ UserPaneDraw(
  *
  * UserPaneBackgroundProc --
  *
- *        This function sets up the background of the user pane that will 
- *        lie under checkboxes and radiobuttons.
+ *	This function sets up the background of the user pane that will
+ *	lie under checkboxes and radiobuttons.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        The user pane background gets set to the current color.
+ *	The user pane background gets set to the current color.
  *
  *--------------------------------------------------------------
  */
@@ -1325,10 +1266,10 @@ UserPaneBackgroundProc(
     ControlHandle control,
     ControlBackgroundPtr info)
 {
-    MacButton * mbPtr;
-    mbPtr = ( MacButton *)GetControlReference(control);
+    MacButton * mbPtr = (MacButton *)(intptr_t)GetControlReference(control);
+
     if (info->colorDevice) {
-        RGBBackColor (&mbPtr->userPaneBackground);
+	TkMacOSXSetColorInPort(mbPtr->userPaneBackground, 0, NULL);
     }
 }
 
@@ -1337,82 +1278,84 @@ UserPaneBackgroundProc(
  *
  * UpdateControlColors --
  *
- *        This function will review the colors used to display
- *        a Macintosh button.  If any non-standard colors are
- *        used we create a custom palette for the button, populate
- *        with the colors for the button and install the palette.
+ *	This function will review the colors used to display
+ *	a Macintosh button. If any non-standard colors are
+ *	used we create a custom palette for the button, populate
+ *	with the colors for the button and install the palette.
  *
- *        Under Appearance, we just set the pointer that will be
- *        used by the UserPaneDrawProc.
+ *	Under Appearance, we just set the pointer that will be
+ *	used by the UserPaneDrawProc.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        The Macintosh control may get a custom palette installed.
+ *	The Macintosh control may get a custom palette installed.
  *
  *--------------------------------------------------------------
  */
 
 static int
-UpdateControlColors(MacButton * mbPtr)
+UpdateControlColors(
+    MacButton *mbPtr)
 {
     XColor *xcolor;
-    TkButton * butPtr = ( TkButton * )mbPtr;
-    
+    TkButton *butPtr = (TkButton *) mbPtr;
+
     /*
      * Under Appearance we cannot change the background of the
-     * button itself.  However, the color we are setting is the color
-     * of the containing userPane.  This will be the color that peeks 
-     * around the rounded corners of the button.  
+     * button itself. However, the color we are setting is the color
+     * of the containing userPane. This will be the color that peeks
+     * around the rounded corners of the button.
      * We make this the highlightbackground rather than the background,
      * because if you color the background of a frame containing a
      * button, you usually also color the highlightbackground as well,
      * or you will get a thin grey ring around the button.
      */
-      
+
     if (butPtr->type == TYPE_BUTTON) {
-        xcolor = Tk_3DBorderColor(butPtr->highlightBorder);
+	xcolor = Tk_3DBorderColor(butPtr->highlightBorder);
     } else {
-        xcolor = Tk_3DBorderColor(butPtr->normalBorder);
+	xcolor = Tk_3DBorderColor(butPtr->normalBorder);
     }
-    TkSetMacColor(xcolor->pixel, &mbPtr->userPaneBackground);
-    
+    mbPtr->userPaneBackground = xcolor->pixel;
+
     return false;
-}
+}
+
 /*
  *--------------------------------------------------------------
  *
  * ButtonEventProc --
  *
- *        This procedure is invoked by the Tk dispatcher for various
- *        events on buttons.
+ *	This procedure is invoked by the Tk dispatcher for various
+ *	events on buttons.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *      When it gets exposed, it is redisplayed.
+ *	When it gets exposed, it is redisplayed.
  *
  *--------------------------------------------------------------
  */
 
 static void
 ButtonEventProc(
-    ClientData clientData,        /* Information about window. */
-    XEvent *eventPtr)                /* Information about event. */
+    ClientData clientData,	/* Information about window. */
+    XEvent *eventPtr)		/* Information about event. */
 {
     TkButton *buttonPtr = (TkButton *) clientData;
+
     if (eventPtr->type == ActivateNotify
-            || eventPtr->type == DeactivateNotify) {
-        if ((buttonPtr->tkwin == NULL) 
-                || (!Tk_IsMapped(buttonPtr->tkwin))) {
-            return;
-        }
-        if ((buttonPtr->flags & REDRAW_PENDING) == 0) {
-            Tcl_DoWhenIdle(TkpDisplayButton, (ClientData) buttonPtr);
-            buttonPtr->flags |= REDRAW_PENDING;
-        }
+	    || eventPtr->type == DeactivateNotify) {
+	if ((buttonPtr->tkwin == NULL) || (!Tk_IsMapped(buttonPtr->tkwin))) {
+	    return;
+	}
+	if ((buttonPtr->flags & REDRAW_PENDING) == 0) {
+	    Tcl_DoWhenIdle(TkpDisplayButton, (ClientData) buttonPtr);
+	    buttonPtr->flags |= REDRAW_PENDING;
+	}
     }
 }
 
@@ -1421,143 +1364,141 @@ ButtonEventProc(
  *
  * TkMacOSXComputeControlParams --
  *
- *        This procedure computes the various parameters used
- *        when creating a Carbon control (NewControl)
- *      These are determined by the various tk button parameters
+ *	This procedure computes the various parameters used
+ *	when creating a Carbon control (NewControl).
+ *	These are determined by the various tk button parameters
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        Sets the control initialisation parameters
+ *	Sets the control initialisation parameters
  *
  *----------------------------------------------------------------------
  */
 
 static void
-TkMacOSXComputeControlParams(TkButton * butPtr, MacControlParams * paramsPtr )
+TkMacOSXComputeControlParams(
+    TkButton *butPtr,
+    MacControlParams *paramsPtr)
 {
     paramsPtr->isBevel = 0;
-    
-    /* 
-     * Determine ProcID based on button type and dimensions 
+
+    /*
+     * Determine ProcID based on button type and dimensions.
      */
-     
+
     switch (butPtr->type) {
-        case TYPE_BUTTON:
-            if ((butPtr->image == None) && (butPtr->bitmap == None)) {
-                paramsPtr->initialValue = 1;
-                paramsPtr->minValue = 0;
-                paramsPtr->maxValue = 1;
-                paramsPtr->procID = kControlPushButtonProc;
-            } else {
-                paramsPtr->initialValue = 0;
-                paramsPtr->minValue = kControlBehaviorOffsetContents
-                    | kControlContentPictHandle;
-                paramsPtr->maxValue = 1;
-                if (butPtr->borderWidth <= 2) {
-                    paramsPtr->procID = kControlBevelButtonSmallBevelProc;
-                } else if (butPtr->borderWidth == 3) {
-                    paramsPtr->procID = kControlBevelButtonNormalBevelProc;
-                } else {
-                    paramsPtr->procID = kControlBevelButtonLargeBevelProc;
-                }
-                paramsPtr->isBevel = 1;                
-            }
-            break;
-        case TYPE_RADIO_BUTTON:
-            if (((butPtr->image == None) && (butPtr->bitmap == None))
-                || (butPtr->indicatorOn)) {
-                paramsPtr->initialValue = 1;
-                paramsPtr->minValue = 0;
-                paramsPtr->maxValue = 1;
-                paramsPtr->procID = kControlRadioButtonProc;
-            } else {
-                paramsPtr->initialValue = 0;
-                paramsPtr->minValue = kControlBehaviorOffsetContents|
-                    kControlBehaviorSticky|
-                    kControlContentPictHandle;
-                paramsPtr->maxValue = 1;
-                if (butPtr->borderWidth <= 2) {
-                    paramsPtr->procID = kControlBevelButtonSmallBevelProc;
-                } else if (butPtr->borderWidth == 3) {
-                    paramsPtr->procID = kControlBevelButtonNormalBevelProc;
-                } else {
-                    paramsPtr->procID = kControlBevelButtonLargeBevelProc;
-                }
-                paramsPtr->isBevel = 1;                
-            }
-            break;
-        case TYPE_CHECK_BUTTON:
-            if (((butPtr->image == None) 
-                    && (butPtr->bitmap == None))
-                    || (butPtr->indicatorOn)) {
-                paramsPtr->initialValue = 1;
-                paramsPtr->minValue = 0;
-                paramsPtr->maxValue = 1;
-                paramsPtr->procID = kControlCheckBoxProc;
-            } else {
-                paramsPtr->initialValue = 0;
-                paramsPtr->minValue = kControlBehaviorOffsetContents
-                    | kControlBehaviorSticky
-                    | kControlContentPictHandle;
-                paramsPtr->maxValue = 1;
-                if (butPtr->borderWidth <= 2) {
-                    paramsPtr->procID = kControlBevelButtonSmallBevelProc;
-                } else if (butPtr->borderWidth == 3) {
-                    paramsPtr->procID = kControlBevelButtonNormalBevelProc;
-                } else {
-                    paramsPtr->procID = kControlBevelButtonLargeBevelProc;
-                }
-                paramsPtr->isBevel = 1;                
-            }   
-            break;
+	case TYPE_BUTTON:
+	    if ((butPtr->image == None) && (butPtr->bitmap == None)) {
+		paramsPtr->initialValue = 1;
+		paramsPtr->minValue = 0;
+		paramsPtr->maxValue = 1;
+		paramsPtr->procID = kControlPushButtonProc;
+	    } else {
+		paramsPtr->initialValue = 0;
+		paramsPtr->minValue = kControlBehaviorOffsetContents |
+			kControlContentPictHandle;
+		paramsPtr->maxValue = 1;
+		if (butPtr->borderWidth <= 2) {
+		    paramsPtr->procID = kControlBevelButtonSmallBevelProc;
+		} else if (butPtr->borderWidth == 3) {
+		    paramsPtr->procID = kControlBevelButtonNormalBevelProc;
+		} else {
+		    paramsPtr->procID = kControlBevelButtonLargeBevelProc;
+		}
+		paramsPtr->isBevel = 1;
+	    }
+	    break;
+	case TYPE_RADIO_BUTTON:
+	    if (((butPtr->image == None) && (butPtr->bitmap == None))
+		|| (butPtr->indicatorOn)) {
+		paramsPtr->initialValue = 1;
+		paramsPtr->minValue = 0;
+		paramsPtr->maxValue = 1;
+		paramsPtr->procID = kControlRadioButtonProc;
+	    } else {
+		paramsPtr->initialValue = 0;
+		paramsPtr->minValue = kControlBehaviorOffsetContents |
+			kControlBehaviorSticky | kControlContentPictHandle;
+		paramsPtr->maxValue = 1;
+		if (butPtr->borderWidth <= 2) {
+		    paramsPtr->procID = kControlBevelButtonSmallBevelProc;
+		} else if (butPtr->borderWidth == 3) {
+		    paramsPtr->procID = kControlBevelButtonNormalBevelProc;
+		} else {
+		    paramsPtr->procID = kControlBevelButtonLargeBevelProc;
+		}
+		paramsPtr->isBevel = 1;
+	    }
+	    break;
+	case TYPE_CHECK_BUTTON:
+	    if (((butPtr->image == None) && (butPtr->bitmap == None))
+		    || (butPtr->indicatorOn)) {
+		paramsPtr->initialValue = 1;
+		paramsPtr->minValue = 0;
+		paramsPtr->maxValue = 1;
+		paramsPtr->procID = kControlCheckBoxProc;
+	    } else {
+		paramsPtr->initialValue = 0;
+		paramsPtr->minValue = kControlBehaviorOffsetContents |
+			kControlBehaviorSticky | kControlContentPictHandle;
+		paramsPtr->maxValue = 1;
+		if (butPtr->borderWidth <= 2) {
+		    paramsPtr->procID = kControlBevelButtonSmallBevelProc;
+		} else if (butPtr->borderWidth == 3) {
+		    paramsPtr->procID = kControlBevelButtonNormalBevelProc;
+		} else {
+		    paramsPtr->procID = kControlBevelButtonLargeBevelProc;
+		}
+		paramsPtr->isBevel = 1;
+	    }
+	    break;
     }
-}
+}
+
 /*
  *----------------------------------------------------------------------
  *
  * TkMacOSXComputeDrawParams --
  *
- *        This procedure computes the various parameters used
- *        when drawing a button
- *      These are determined by the various tk button parameters
+ *	This procedure computes the various parameters used
+ *	when drawing a button
+ *	These are determined by the various tk button parameters
  *
  * Results:
- *        1 if control will be used, 0 otherwise.
+ *	1 if control will be used, 0 otherwise.
  *
  * Side effects:
- *        Sets the button draw parameters
+ *	Sets the button draw parameters
  *
  *----------------------------------------------------------------------
  */
 
 static int
-TkMacOSXComputeDrawParams(TkButton * butPtr, DrawParams * dpPtr)
+TkMacOSXComputeDrawParams(
+    TkButton *butPtr,
+    DrawParams *dpPtr)
 {
-    dpPtr->hasImageOrBitmap = ((butPtr->image != NULL) 
-            || (butPtr->bitmap != None));
-    dpPtr->offset = (butPtr->type == TYPE_BUTTON) 
-            && dpPtr->hasImageOrBitmap;
+    dpPtr->hasImageOrBitmap = ((butPtr->image != NULL)
+	    || (butPtr->bitmap != None));
+    dpPtr->offset = (butPtr->type == TYPE_BUTTON)
+	    && dpPtr->hasImageOrBitmap;
     dpPtr->border = butPtr->normalBorder;
-    if ((butPtr->state == STATE_DISABLED) 
-            && (butPtr->disabledFg != NULL)) {
-        dpPtr->gc = butPtr->disabledGC;
-    } else if ((butPtr->type == TYPE_BUTTON)
-            && (butPtr->state == STATE_ACTIVE)) {
-        dpPtr->gc = butPtr->activeTextGC;
-        dpPtr->border = butPtr->activeBorder;
+    if ((butPtr->state == STATE_DISABLED) && (butPtr->disabledFg != NULL)) {
+	dpPtr->gc = butPtr->disabledGC;
+    } else if (butPtr->type == TYPE_BUTTON && butPtr->state == STATE_ACTIVE) {
+	dpPtr->gc = butPtr->activeTextGC;
+	dpPtr->border = butPtr->activeBorder;
     } else {
-        dpPtr->gc = butPtr->normalTextGC;
+	dpPtr->gc = butPtr->normalTextGC;
     }
 
-    if ((butPtr->flags & SELECTED) 
-            && (butPtr->state != STATE_ACTIVE)
-            && (butPtr->selectBorder != NULL) 
-            && !butPtr->indicatorOn) {
-       dpPtr->border = butPtr->selectBorder;
+    if ((butPtr->flags & SELECTED) && (butPtr->state != STATE_ACTIVE)
+	    && (butPtr->selectBorder != NULL) && !butPtr->indicatorOn) {
+	dpPtr->border = butPtr->selectBorder;
     }
-    
+
     /*
      * Override the relief specified for the button if this is a
      * checkbutton or radiobutton and there's no indicator.
@@ -1568,69 +1509,70 @@ TkMacOSXComputeDrawParams(TkButton * butPtr, DrawParams * dpPtr)
     dpPtr->relief = butPtr->relief;
 
     if ((butPtr->type >= TYPE_CHECK_BUTTON) && !butPtr->indicatorOn) {
-        if (!dpPtr->hasImageOrBitmap) {
-            dpPtr->relief = (butPtr->flags & SELECTED) ? TK_RELIEF_SUNKEN
-                : TK_RELIEF_RAISED;
-        }
+	if (!dpPtr->hasImageOrBitmap) {
+	    dpPtr->relief = (butPtr->flags & SELECTED) ? TK_RELIEF_SUNKEN
+		    : TK_RELIEF_RAISED;
+	}
     }
 
     /*
      * Determine the draw type
      */
+
     if (butPtr->type == TYPE_LABEL) {
-        dpPtr->drawType = DRAW_LABEL;
+	dpPtr->drawType = DRAW_LABEL;
     } else if (butPtr->type == TYPE_BUTTON) {
-        if (!dpPtr->hasImageOrBitmap) {
-            dpPtr->drawType = DRAW_CONTROL;
-        } else if (butPtr->image != None) {
-            dpPtr->drawType = DRAW_BEVEL;
-        } else {
-            /*
-             * TO DO - The current way the we draw bitmaps (XCopyPlane)
-             * uses CopyDeepMask in this one case.  The Picture recording 
-             * does not record this call, and so we can't use the
-             * Appearance bevel button here.  The only case that would
-             * exercise this is if you use a bitmap, with
-             * -data & -mask specified.         We should probably draw the 
-             * appearance button and overprint the image in this case.
-             * This just punts and draws the old-style, ugly, button.
-             */
-             
-            if (dpPtr->gc->clip_mask == 0) {
-                dpPtr->drawType = DRAW_BEVEL;
-            } else {
-                TkpClipMask *clipPtr = (TkpClipMask*) dpPtr->gc->clip_mask;
-                if ((clipPtr->type == TKP_CLIP_PIXMAP) &&
-                        (clipPtr->value.pixmap != butPtr->bitmap)) {
-                    dpPtr->drawType = DRAW_CUSTOM;
-                } else {
-                    dpPtr->drawType = DRAW_BEVEL;
-                }
-            }
-        }
+	if (!dpPtr->hasImageOrBitmap) {
+	    dpPtr->drawType = DRAW_CONTROL;
+	} else if (butPtr->image != None) {
+	    dpPtr->drawType = DRAW_BEVEL;
+	} else {
+	    /*
+	     * TO DO - The current way the we draw bitmaps (XCopyPlane)
+	     * uses CopyDeepMask in this one case. The Picture recording
+	     * does not record this call, and so we can't use the
+	     * Appearance bevel button here. The only case that would
+	     * exercise this is if you use a bitmap, with
+	     * -data & -mask specified. We should probably draw the
+	     * appearance button and overprint the image in this case.
+	     * This just punts and draws the old-style, ugly, button.
+	     */
+
+	    if (dpPtr->gc->clip_mask == 0) {
+		dpPtr->drawType = DRAW_BEVEL;
+	    } else {
+		TkpClipMask *clipPtr = (TkpClipMask *) dpPtr->gc->clip_mask;
+
+		if ((clipPtr->type == TKP_CLIP_PIXMAP) &&
+			(clipPtr->value.pixmap != butPtr->bitmap)) {
+		    dpPtr->drawType = DRAW_CUSTOM;
+		} else {
+		    dpPtr->drawType = DRAW_BEVEL;
+		}
+	    }
+	}
+    } else if (butPtr->indicatorOn) {
+	dpPtr->drawType = DRAW_CONTROL;
+    } else if (dpPtr->hasImageOrBitmap) {
+	if (dpPtr->gc->clip_mask == 0) {
+	    dpPtr->drawType = DRAW_BEVEL;
+	} else {
+	    TkpClipMask *clipPtr = (TkpClipMask*) dpPtr->gc->clip_mask;
+
+	    if ((clipPtr->type == TKP_CLIP_PIXMAP) &&
+		    (clipPtr->value.pixmap != butPtr->bitmap)) {
+		dpPtr->drawType = DRAW_CUSTOM;
+	    } else {
+		dpPtr->drawType = DRAW_BEVEL;
+	    }
+	}
     } else {
-        if (butPtr->indicatorOn) {
-            dpPtr->drawType = DRAW_CONTROL;
-        } else if (dpPtr->hasImageOrBitmap) {
-            if (dpPtr->gc->clip_mask == 0) {
-                dpPtr->drawType = DRAW_BEVEL;
-            } else {
-                TkpClipMask *clipPtr = (TkpClipMask*) dpPtr->gc->clip_mask;
-                if ((clipPtr->type == TKP_CLIP_PIXMAP) &&
-                        (clipPtr->value.pixmap != butPtr->bitmap)) {
-                    dpPtr->drawType = DRAW_CUSTOM;
-                } else {
-                    dpPtr->drawType = DRAW_BEVEL;
-                }
-            }
-        } else {
-            dpPtr->drawType = DRAW_CUSTOM;
-        }
+	dpPtr->drawType = DRAW_CUSTOM;
     }
 
     if ((dpPtr->drawType == DRAW_CONTROL) || (dpPtr->drawType == DRAW_BEVEL)) {
-        return 1;
+	return 1;
     } else {
-        return 0;
+	return 0;
     }
 }