* 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, 155 insertions, 173 deletions

diff --git a/macosx/tkMacOSXEntry.c b/macosx/tkMacOSXEntry.c
index f231937..1f12cf5 100644
--- a/macosx/tkMacOSXEntry.c
+++ b/macosx/tkMacOSXEntry.c
@@ -1,56 +1,59 @@
 /*
  * tkMacOSXEntry.c --
  *
- *      This file implements functions that decode & handle keyboard events
- *      on MacOS X.
+ *	This file implements the native aqua entry widget.
  *
- *      Copyright 2001, Apple Computer, Inc.
+ * Copyright 2001, Apple Computer, Inc.
+ * Copyright (c) 2006-2007 Daniel A. Steffen <das@users.sourceforge.net>
  *
- *      The following terms apply to all files originating from Apple
- *      Computer, Inc. ("Apple") and associated with the software
- *      unless explicitly disclaimed in individual files.
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
+ *	The following terms apply to all files originating from Apple
+ *	Computer, Inc. ("Apple") and associated with the software
+ *	unless explicitly disclaimed in individual files.
  *
- *      Apple hereby grants permission to use, copy, modify,
- *      distribute, and license this software and its documentation
- *      for any purpose, provided that existing copyright notices are
- *      retained in all copies and that this notice is included
- *      verbatim in any distributions. No written agreement, license,
- *      or royalty fee is required for any of the authorized
- *      uses. Modifications to this software may be copyrighted by
- *      their authors and need not follow the licensing terms
- *      described here, provided that the new terms are clearly
- *      indicated on the first page of each file where they apply.
  *
+ *	Apple hereby grants permission to use, copy, modify,
+ *	distribute, and license this software and its documentation
+ *	for any purpose, provided that existing copyright notices are
+ *	retained in all copies and that this notice is included
+ *	verbatim in any distributions. No written agreement, license,
+ *	or royalty fee is required for any of the authorized
+ *	uses. Modifications to this software may be copyrighted by
+ *	their authors and need not follow the licensing terms
+ *	described here, provided that the new terms are clearly
+ *	indicated on the first page of each file where they apply.
  *
- *      IN NO EVENT SHALL APPLE, THE AUTHORS OR DISTRIBUTORS OF THE
- *      SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL,
- *      INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
- *      THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF,
- *      EVEN IF APPLE OR THE AUTHORS HAVE BEEN ADVISED OF THE
- *      POSSIBILITY OF SUCH DAMAGE.  APPLE, THE AUTHORS AND
- *      DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING,
- *      BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
- *      FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS
- *      SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND APPLE,THE
- *      AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
- *      MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
- *      GOVERNMENT USE: If you are acquiring this software on behalf
- *      of the U.S. government, the Government shall have only
- *      "Restricted Rights" in the software and related documentation
- *      as defined in the Federal Acquisition Regulations (FARs) in
- *      Clause 52.227.19 (c) (2).  If you are acquiring the software
- *      on behalf of the Department of Defense, the software shall be
- *      classified as "Commercial Computer Software" and the
- *      Government shall have only "Restricted Rights" as defined in
- *      Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
- *      foregoing, the authors grant the U.S. Government and others
- *      acting in its behalf permission to use and distribute the
- *      software in accordance with the terms specified in this
- *      license.
+ *	IN NO EVENT SHALL APPLE, THE AUTHORS OR DISTRIBUTORS OF THE
+ *	SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL,
+ *	INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
+ *	THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF,
+ *	EVEN IF APPLE OR THE AUTHORS HAVE BEEN ADVISED OF THE
+ *	POSSIBILITY OF SUCH DAMAGE.  APPLE, THE AUTHORS AND
+ *	DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING,
+ *	BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ *	FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.	 THIS
+ *	SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND APPLE,THE
+ *	AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
+ *	MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
- * RCS: @(#) $Id: tkMacOSXEntry.c,v 1.2.2.7 2006/09/10 17:07:36 das Exp $
+ *	GOVERNMENT USE: If you are acquiring this software on behalf
+ *	of the U.S. government, the Government shall have only
+ *	"Restricted Rights" in the software and related documentation
+ *	as defined in the Federal Acquisition Regulations (FARs) in
+ *	Clause 52.227.19 (c) (2).  If you are acquiring the software
+ *	on behalf of the Department of Defense, the software shall be
+ *	classified as "Commercial Computer Software" and the
+ *	Government shall have only "Restricted Rights" as defined in
+ *	Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
+ *	foregoing, the authors grant the U.S. Government and others
+ *	acting in its behalf permission to use and distribute the
+ *	software in accordance with the terms specified in this
+ *	license.
+ *
+ * RCS: @(#) $Id: tkMacOSXEntry.c,v 1.2.2.8 2007/04/29 02:26:49 das Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -65,8 +68,8 @@ static ThemeButtonKind ComputeIncDecParameters (int height, int *width);
  * ComputeIncDecParameters --
  *
  *	This procedure figures out which of the kThemeIncDec
- *      buttons to use.  It also sets width to the width of the
- *      IncDec button.
+ *	buttons to use. It also sets width to the width of the
+ *	IncDec button.
  *
  * Results:
  *	The ThemeButtonKind of the button we should use.
@@ -79,45 +82,37 @@ static ThemeButtonKind ComputeIncDecParameters (int height, int *width);
 static ThemeButtonKind
 ComputeIncDecParameters (int height, int *width)
 {
-    static int version = 0;
-    
-    if (version == 0) {
-        Gestalt(gestaltSystemVersion, (long *) &version);
-    }
-    
-    /* 
-     * The small and mini incDec buttons were introduced in 10.3.
-     */
-    #ifndef kThemeIncDecButtonSmall
-    #define kThemeIncDecButtonSmall 21
-    #endif
-    #ifndef kThemeIncDecButtonMini
-    #define kThemeIncDecButtonMini 22
-    #endif
-     
-    if (version >= 0x1030) {
-        if (height < 11 || height > 28) {
-            *width = 0;
-            return (ThemeButtonKind) 0;
-        }
-        
-        if (height >= 21) {
-            *width = 13;
-            return kThemeIncDecButton;
-        } else if (height >= 18) {
-            *width = 12;
-            return kThemeIncDecButtonSmall;
-        } else {
-            *width = 11;
-            return kThemeIncDecButtonMini;
-        }
-    } else {
-        if (height < 21 || height > 28) {
-            *width = 0;
-            return (ThemeButtonKind) 0;
-        }
-        *width = 13;
-        return kThemeIncDecButton;
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
+    if (1
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1030
+	    && &kHIToolboxVersionNumber != NULL
+	    && kHIToolboxVersionNumber >= kHIToolboxVersionNumber10_3
+#endif
+    ) {
+	if (height < 11 || height > 28) {
+	    *width = 0;
+	    return (ThemeButtonKind) 0;
+	}
+
+	if (height >= 21) {
+	    *width = 13;
+	    return kThemeIncDecButton;
+	} else if (height >= 18) {
+	    *width = 12;
+	    return kThemeIncDecButtonSmall;
+	} else {
+	    *width = 11;
+	    return kThemeIncDecButtonMini;
+	}
+    } else
+#endif
+    {
+	if (height < 21 || height > 28) {
+	    *width = 0;
+	    return (ThemeButtonKind) 0;
+	}
+	*width = 13;
+	return kThemeIncDecButton;
     }
 }
 
@@ -127,11 +122,11 @@ ComputeIncDecParameters (int height, int *width)
  * TkpDrawEntryBorderAndFocus --
  *
  *	This procedure redraws the border of an entry window.
- *      It overrides the generic border drawing code if the 
- *      entry widget parameters are such that the native widget
- *      drawing is a good fit.
- *      This version just returns 1, so platforms that don't
- *      do special native drawing don't have to implement it.
+ *	It overrides the generic border drawing code if the
+ *	entry widget parameters are such that the native widget
+ *	drawing is a good fit.
+ *	This version just returns 1, so platforms that don't
+ *	do special native drawing don't have to implement it.
  *
  * Results:
  *	1 if it has drawn the border, 0 if not.
@@ -145,44 +140,41 @@ int
 TkpDrawEntryBorderAndFocus(Entry *entryPtr, Drawable d, int isSpinbox)
 {
     Rect bounds;
-    CGrafPtr saveWorld;
-    GDHandle saveDevice;
-    GWorldPtr destPort;
+    TkMacOSXDrawingContext dc;
     GC bgGC;
     Tk_Window tkwin = entryPtr->tkwin;
     ThemeDrawState drawState;
     int oldWidth = 0;
+    MacDrawable *macDraw = (MacDrawable *) d;
 
-    /* 
-     * I use 6 as the borderwidth.  2 of the 5 go into the actual frame the
+    /*
+     * I use 6 as the borderwidth. 2 of the 5 go into the actual frame the
      * 3 are because the Mac OS Entry widgets leave more space around the
      * Text than Tk does on X11.
      */
-     
-    if (entryPtr->borderWidth != MAC_OSX_ENTRY_BORDER 
-            || entryPtr->highlightWidth != MAC_OSX_FOCUS_WIDTH
-            || entryPtr->relief != MAC_OSX_ENTRY_RELIEF) {
-        return 0;
+
+    if (entryPtr->borderWidth != MAC_OSX_ENTRY_BORDER
+	    || entryPtr->highlightWidth != MAC_OSX_FOCUS_WIDTH
+	    || entryPtr->relief != MAC_OSX_ENTRY_RELIEF) {
+	return 0;
     }
-    
-    destPort = TkMacOSXGetDrawablePort(d);
 
     /*
      * For the spinbox, we have to make the entry part smaller by the size
-     * of the buttons.  We also leave 2 pixels to the left (as per the HIG)
+     * of the buttons. We also leave 2 pixels to the left (as per the HIG)
      * and space for one pixel to the right, 'cause it makes the buttons look
-     * nicer. 
+     * nicer.
      */
-     
+
     if (isSpinbox) {
-        ThemeButtonKind buttonKind;
-        int incDecWidth;
-        
-        oldWidth = Tk_Width(tkwin);
-        
-        buttonKind = ComputeIncDecParameters(Tk_Height(tkwin) 
-                - 2 * MAC_OSX_FOCUS_WIDTH, &incDecWidth);
-        Tk_Width(tkwin) -= incDecWidth + 1;
+	ThemeButtonKind buttonKind;
+	int incDecWidth;
+
+	oldWidth = Tk_Width(tkwin);
+
+	buttonKind = ComputeIncDecParameters(Tk_Height(tkwin)
+		- 2 * MAC_OSX_FOCUS_WIDTH, &incDecWidth);
+	Tk_Width(tkwin) -= incDecWidth + 1;
     }
 
    /*
@@ -190,42 +182,39 @@ TkpDrawEntryBorderAndFocus(Entry *entryPtr, Drawable d, int isSpinbox)
     * part of the ring, so we have to draw over the edges of the
     * ring before drawing the focus or the text will peep through.
     */
-    
+
     bgGC = Tk_GCForColor(entryPtr->highlightBgColorPtr, d);
     TkDrawInsetFocusHighlight(entryPtr->tkwin, bgGC, MAC_OSX_FOCUS_WIDTH, d, 0);
-    
-    GetGWorld(&saveWorld, &saveDevice);
-    SetGWorld(destPort, NULL);
-    
+
     /*
-     * Inset the entry Frame by the maximum width of the focus rect, 
+     * Inset the entry Frame by the maximum width of the focus rect,
      * which is 3 according to the Carbon docs.
      */
-     
-    bounds.top = MAC_OSX_FOCUS_WIDTH;
-    bounds.left = MAC_OSX_FOCUS_WIDTH;
-    bounds.right = Tk_Width(tkwin) - MAC_OSX_FOCUS_WIDTH;
-    bounds.bottom = Tk_Height(tkwin) - MAC_OSX_FOCUS_WIDTH;
+
+    bounds.left = macDraw->xOff + MAC_OSX_FOCUS_WIDTH;
+    bounds.top = macDraw->yOff + MAC_OSX_FOCUS_WIDTH;
+    bounds.right = macDraw->xOff + Tk_Width(tkwin) - MAC_OSX_FOCUS_WIDTH;
+    bounds.bottom = macDraw->yOff + Tk_Height(tkwin) - MAC_OSX_FOCUS_WIDTH;
     if (entryPtr->state == STATE_DISABLED) {
-        drawState = kThemeStateInactive;
+	drawState = kThemeStateInactive;
     } else {
-        drawState = kThemeStateActive;
+	drawState = kThemeStateActive;
     }
+    TkMacOSXSetupDrawingContext(d, NULL, 0, &dc);
     DrawThemeEditTextFrame(&bounds, drawState);
     if (entryPtr->flags & GOT_FOCUS) {
-        /* 
-         * Don't call this if we don't have the focus, because then it
-         * erases the focus rect to white, but we've already drawn the
-         * highlightbackground above.  
-         */
+	/*
+	 * Don't call this if we don't have the focus, because then it
+	 * erases the focus rect to white, but we've already drawn the
+	 * highlightbackground above.
+	 */
 
-        DrawThemeFocusRect(&bounds, (entryPtr->flags & GOT_FOCUS) != 0);
+	DrawThemeFocusRect(&bounds, (entryPtr->flags & GOT_FOCUS) != 0);
     }
-    SetGWorld(saveWorld, saveDevice);
-    
     if (isSpinbox) {
-        Tk_Width(tkwin) = oldWidth;
+	Tk_Width(tkwin) = oldWidth;
     }
+    TkMacOSXRestoreDrawingContext(&dc);
     return 1;
 }
 /*
@@ -234,11 +223,11 @@ TkpDrawEntryBorderAndFocus(Entry *entryPtr, Drawable d, int isSpinbox)
  * TkpDrawSpinboxButtons --
  *
  *	This procedure redraws the buttons of an spinbox widget.
- *      It overrides the generic button drawing code if the 
- *      spinbox widget parameters are such that the native widget
- *      drawing is a good fit.
- *      This version just returns 0, so platforms that don't
- *      do special native drawing don't have to implement it.
+ *	It overrides the generic button drawing code if the
+ *	spinbox widget parameters are such that the native widget
+ *	drawing is a good fit.
+ *	This version just returns 0, so platforms that don't
+ *	do special native drawing don't have to implement it.
  *
  * Results:
  *	1 if it has drawn the border, 0 if not.
@@ -252,7 +241,6 @@ TkpDrawEntryBorderAndFocus(Entry *entryPtr, Drawable d, int isSpinbox)
 int
 TkpDrawSpinboxButtons(Spinbox *sbPtr, Drawable d)
 {
-    OSStatus err;
     Rect inBounds;
     ThemeButtonKind inKind;
     ThemeButtonDrawInfo inNewInfo;
@@ -264,71 +252,65 @@ TkpDrawSpinboxButtons(Spinbox *sbPtr, Drawable d)
     int height = Tk_Height(tkwin);
     int buttonHeight = height - 2 * MAC_OSX_FOCUS_WIDTH;
     int incDecWidth;
-    CGrafPtr saveWorld;
-    GDHandle saveDevice;
-    GWorldPtr destPort;
+    TkMacOSXDrawingContext dc;
     XRectangle rects[1];
     GC bgGC;
+    MacDrawable *macDraw = (MacDrawable *) d;
 
     /* FIXME RAISED really makes more sense */
     if (sbPtr->buRelief != TK_RELIEF_FLAT) {
-        return 0;
+	return 0;
     }
-    
-    /* 
+
+    /*
      * The actual sizes of the IncDec button are 21 for the normal,
-     * 18 for the small and 15 for the mini.  But the spinbox still
+     * 18 for the small and 15 for the mini. But the spinbox still
      * looks okay if the entry is a little bigger than this, so we
      * give it a little slop.
      */
-     
+
     inKind = ComputeIncDecParameters(buttonHeight, &incDecWidth);
     if (inKind == (ThemeButtonKind) 0) {
-        return 0;
+	return 0;
     }
-    
-    destPort = TkMacOSXGetDrawablePort(d);
-    GetGWorld(&saveWorld, &saveDevice);
-    SetGWorld(destPort, NULL);
 
     if (sbPtr->entry.state == STATE_DISABLED) {
-        inNewInfo.state = kThemeStateInactive;
-        inNewInfo.value = kThemeButtonOff;
+	inNewInfo.state = kThemeStateInactive;
+	inNewInfo.value = kThemeButtonOff;
     } else if (sbPtr->selElement == SEL_BUTTONUP) {
-        inNewInfo.state = kThemeStatePressedUp;
-        inNewInfo.value = kThemeButtonOn;
+	inNewInfo.state = kThemeStatePressedUp;
+	inNewInfo.value = kThemeButtonOn;
     } else if (sbPtr->selElement == SEL_BUTTONDOWN) {
-        inNewInfo.state = kThemeStatePressedDown;
-        inNewInfo.value = kThemeButtonOn;
+	inNewInfo.state = kThemeStatePressedDown;
+	inNewInfo.value = kThemeButtonOn;
     } else {
-        inNewInfo.state = kThemeStateActive;
-        inNewInfo.value = kThemeButtonOff;
+	inNewInfo.state = kThemeStateActive;
+	inNewInfo.value = kThemeButtonOff;
     }
-    
+
     inNewInfo.adornment = kThemeAdornmentNone;
 
-    inBounds.left = Tk_Width(tkwin) - incDecWidth - 1;
-    inBounds.right = Tk_Width(tkwin) - 1;
-    inBounds.top = MAC_OSX_FOCUS_WIDTH;
-    inBounds.bottom = Tk_Height(tkwin) - MAC_OSX_FOCUS_WIDTH;
-    
+    inBounds.left = macDraw->xOff + Tk_Width(tkwin) - incDecWidth - 1;
+    inBounds.right = macDraw->xOff + Tk_Width(tkwin) - 1;
+    inBounds.top = macDraw->yOff + MAC_OSX_FOCUS_WIDTH;
+    inBounds.bottom = macDraw->yOff + Tk_Height(tkwin) - MAC_OSX_FOCUS_WIDTH;
+
     /* We had to make the entry part of the window smaller so that we
-     * wouldn't overdraw the spin buttons with the focus highlight.  SO
+     * wouldn't overdraw the spin buttons with the focus highlight. So
      * now we have to draw the highlightbackground.
      */
-     
+
     bgGC = Tk_GCForColor(sbPtr->entry.highlightBgColorPtr, d);
     rects[0].x = inBounds.left;
     rects[0].y = 0;
     rects[0].width = Tk_Width(tkwin);
     rects[0].height = Tk_Height(tkwin);
     XFillRectangles(Tk_Display(tkwin), d, bgGC, rects, 1);
-    
-    err =  DrawThemeButton (&inBounds, inKind, &inNewInfo, inPrevInfo,
-            inEraseProc, inLabelProc, inUserData);
-
-    SetGWorld(saveWorld, saveDevice);
 
+    TkMacOSXSetupDrawingContext(d, NULL, 0, &dc);
+    ChkErr(DrawThemeButton, &inBounds, inKind, &inNewInfo, inPrevInfo,
+	    inEraseProc, inLabelProc, inUserData);
+    TkMacOSXRestoreDrawingContext(&dc);
     return 1;
 }