* 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, 138 insertions, 139 deletions

diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c
index eecb6f1..7227ce6 100644
--- a/macosx/tkMacOSXBitmap.c
+++ b/macosx/tkMacOSXBitmap.c
@@ -1,15 +1,16 @@
-/* 
+/*
  * tkMacOSXBitmap.c --
  *
- *        This file handles the implementation of native bitmaps.
+ *	This file handles the implementation of native bitmaps.
  *
  * Copyright (c) 1996-1997 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: tkMacOSXBitmap.c,v 1.2.2.2 2006/03/28 02:44:12 das Exp $
+ * RCS: @(#) $Id: tkMacOSXBitmap.c,v 1.2.2.3 2007/04/29 02:26:47 das Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -18,17 +19,17 @@
  * Depending on the resource type there are different ways to
  * draw native icons.
  */
-#define TYPE1        0        /* Family icon suite. */
-#define TYPE2        1        /* ICON resource. */
-#define TYPE3        2        /* cicn resource. */
+#define TYPE1	0		/* Family icon suite. */
+#define TYPE2	1		/* ICON resource. */
+#define TYPE3	2		/* cicn resource. */
 
 /*
  * This data structure describes the id and type of a given icon.
  * It is used as the source for native icons.
  */
 typedef struct {
-    int id;                /* Resource Id for Icon. */
-    long int type;        /* Type of icon. */
+    int id;			/* Resource Id for Icon. */
+    long int type;		/* Type of icon. */
 } NativeIcon;
 
 /*
@@ -36,10 +37,10 @@ typedef struct {
  */
 
 typedef struct {
-    char *name;                        /* Name of icon. */
-    long int type;                /* Type of icon. */
-    int id;                        /* Id of icon. */
-    int size;                        /* Size of icon. */
+    const char *name;		/* Name of icon. */
+    long int type;		/* Type of icon. */
+    int id;			/* Id of icon. */
+    int size;			/* Size of icon. */
 } BuiltInIcon;
 
 /*
@@ -48,23 +49,23 @@ typedef struct {
  */
 
 static BuiltInIcon builtInIcons[] = {
-    {"document",        TYPE1,        kGenericDocumentIconResource,           32},
-    {"stationery",      TYPE1,        kGenericStationeryIconResource,         32},
-    {"edition",         TYPE1,        kGenericEditionFileIconResource,        32},
-    {"application",     TYPE1,        kGenericApplicationIconResource,        32},
-    {"accessory",       TYPE1,        kGenericDeskAccessoryIconResource,      32},
-    {"folder",          TYPE1,        kGenericFolderIconResource,             32},
-    {"pfolder",         TYPE1,        kPrivateFolderIconResource,             32},
-    {"trash",           TYPE1,        kTrashIconResource,                     32},
-    {"floppy",          TYPE1,        kFloppyIconResource,                    32},
-    {"ramdisk",         TYPE1,        kGenericRAMDiskIconResource,            32},
-    {"cdrom",           TYPE1,        kGenericCDROMIconResource,              32},
-    {"preferences",     TYPE1,        kGenericPreferencesIconResource,        32},
-    {"querydoc",        TYPE1,        kGenericQueryDocumentIconResource,      32},
-    {"stop",            TYPE2,        kStopIcon,                              32},
-    {"note",            TYPE2,        kNoteIcon,                              32},
-    {"caution",         TYPE2,        kCautionIcon,                           32},
-    {(char *) NULL,        0,        0,                                        0}
+    {"document",	TYPE1,	kGenericDocumentIconResource,		32},
+    {"stationery",	TYPE1,	kGenericStationeryIconResource,		32},
+    {"edition",		TYPE1,	kGenericEditionFileIconResource,	32},
+    {"application",	TYPE1,	kGenericApplicationIconResource,	32},
+    {"accessory",	TYPE1,	kGenericDeskAccessoryIconResource,	32},
+    {"folder",		TYPE1,	kGenericFolderIconResource,		32},
+    {"pfolder",		TYPE1,	kPrivateFolderIconResource,		32},
+    {"trash",		TYPE1,	kTrashIconResource,			32},
+    {"floppy",		TYPE1,	kFloppyIconResource,			32},
+    {"ramdisk",		TYPE1,	kGenericRAMDiskIconResource,		32},
+    {"cdrom",		TYPE1,	kGenericCDROMIconResource,		32},
+    {"preferences",	TYPE1,	kGenericPreferencesIconResource,	32},
+    {"querydoc",	TYPE1,	kGenericQueryDocumentIconResource,	32},
+    {"stop",		TYPE2,	kStopIcon,				32},
+    {"note",		TYPE2,	kNoteIcon,				32},
+    {"caution",		TYPE2,	kCautionIcon,				32},
+    {NULL,		0,	0,					0}
 };
 
 /*
@@ -72,46 +73,46 @@ static BuiltInIcon builtInIcons[] = {
  *
  * TkpDefineNativeBitmaps --
  *
- *        Add native bitmaps.
+ *	Add native bitmaps.
  *
  * Results:
- *        A standard Tcl result.  If an error occurs then TCL_ERROR is
- *        returned and a message is left in the interp's result.
+ *	A standard Tcl result. If an error occurs then TCL_ERROR is
+ *	returned and a message is left in the interp's result.
  *
  * Side effects:
- *        "Name" is entered into the bitmap table and may be used from
- *        here on to refer to the given bitmap.
+ *	"Name" is entered into the bitmap table and may be used from
+ *	here on to refer to the given bitmap.
  *
  *----------------------------------------------------------------------
  */
 
 void
-TkpDefineNativeBitmaps()
+TkpDefineNativeBitmaps(void)
 {
-    int new;
-    Tcl_HashEntry *predefHashPtr;
-    TkPredefBitmap *predefPtr;
-    CONST char * name;
+    Tcl_HashTable *tablePtr = TkGetBitmapPredefTable();
     BuiltInIcon *builtInPtr;
-    NativeIcon *nativeIconPtr;
-    Tcl_HashTable *tablePtr;
-    
+
     for (builtInPtr = builtInIcons; builtInPtr->name != NULL; builtInPtr++) {
-        name = Tk_GetUid(builtInPtr->name);
-        tablePtr = TkGetBitmapPredefTable();
-        predefHashPtr = Tcl_CreateHashEntry(tablePtr, name, &new);
-        if (!new) {
-            continue;
-        }
-        predefPtr = (TkPredefBitmap *) ckalloc(sizeof(TkPredefBitmap));
-        nativeIconPtr = (NativeIcon *) ckalloc(sizeof(NativeIcon));
-        nativeIconPtr->id = builtInPtr->id;
-        nativeIconPtr->type = builtInPtr->type;
-        predefPtr->source = (char *) nativeIconPtr;
-        predefPtr->width = builtInPtr->size;
-        predefPtr->height = builtInPtr->size;
-        predefPtr->native = 1;
-        Tcl_SetHashValue(predefHashPtr, predefPtr);
+	Tcl_HashEntry *predefHashPtr;
+	const char * name;
+	int isNew;
+
+	name = Tk_GetUid(builtInPtr->name);
+	predefHashPtr = Tcl_CreateHashEntry(tablePtr, name, &isNew);
+	if (isNew) {
+	    TkPredefBitmap *predefPtr = (TkPredefBitmap *)
+		    ckalloc(sizeof(TkPredefBitmap));
+	    NativeIcon *nativeIconPtr = (NativeIcon *)
+		    ckalloc(sizeof(NativeIcon));
+
+	    nativeIconPtr->id = builtInPtr->id;
+	    nativeIconPtr->type = builtInPtr->type;
+	    predefPtr->source = (char *) nativeIconPtr;
+	    predefPtr->width = builtInPtr->size;
+	    predefPtr->height = builtInPtr->size;
+	    predefPtr->native = 1;
+	    Tcl_SetHashValue(predefHashPtr, predefPtr);
+	}
     }
 }
 
@@ -120,15 +121,15 @@ TkpDefineNativeBitmaps()
  *
  * TkpCreateNativeBitmap --
  *
- *        Add native bitmaps.
+ *	Add native bitmaps.
  *
  * Results:
- *        A standard Tcl result.  If an error occurs then TCL_ERROR is
- *        returned and a message is left in the interp's result.
+ *	A standard Tcl result. If an error occurs then TCL_ERROR is
+ *	returned and a message is left in the interp's result.
  *
  * Side effects:
- *        "Name" is entered into the bitmap table and may be used from
- *        here on to refer to the given bitmap.
+ *	"Name" is entered into the bitmap table and may be used from
+ *	here on to refer to the given bitmap.
  *
  *----------------------------------------------------------------------
  */
@@ -136,42 +137,40 @@ TkpDefineNativeBitmaps()
 Pixmap
 TkpCreateNativeBitmap(
     Display *display,
-    CONST char * source)                /* Info about the icon to build. */
+    CONST char *source)		/* Info about the icon to build. */
 {
     Pixmap pix;
-    GWorldPtr destPort;
     Rect destRect;
-    Handle icon;
-    CGrafPtr saveWorld;
-    GDHandle saveDevice;
-    NativeIcon *nativeIconPtr;
-    
-    pix = Tk_GetPixmap(display, None, 32, 32, 0);
-    destPort = TkMacOSXGetDrawablePort(pix);
+    CGrafPtr savePort;
+    Boolean portChanged;
+    const NativeIcon *nativeIconPtr;
 
-    GetGWorld(&saveWorld, &saveDevice);
-    SetGWorld(destPort, NULL);
+    pix = Tk_GetPixmap(display, None, 32, 32, 0);
+    portChanged = QDSwapPort(TkMacOSXGetDrawablePort(pix), &savePort);
 
-    nativeIconPtr = (NativeIcon *) source;
+    nativeIconPtr = (const NativeIcon *) source;
     SetRect(&destRect, 0, 0, 32, 32);
     if (nativeIconPtr->type == TYPE1) {
-        RGBColor white = {0xFFFF, 0xFFFF, 0xFFFF};
+	RGBColor white = {0xFFFF, 0xFFFF, 0xFFFF};
 
-        RGBForeColor(&white);
-        PaintRect(&destRect);
-        PlotIconID(&destRect, atAbsoluteCenter, ttNone, nativeIconPtr->id);
+	RGBForeColor(&white);
+	PaintRect(&destRect);
+	PlotIconID(&destRect, atAbsoluteCenter, ttNone, nativeIconPtr->id);
     } else if (nativeIconPtr->type == TYPE2) {
-        icon = GetIcon(nativeIconPtr->id);
-        if (icon != NULL) {
-            RGBColor black = {0, 0, 0};
-        
-            RGBForeColor(&black);
-            PlotIcon(&destRect, icon);
-            ReleaseResource(icon);
-        }
+	Handle icon = GetIcon(nativeIconPtr->id);
+
+	if (icon != NULL) {
+	    RGBColor black = {0, 0, 0};
+
+	    RGBForeColor(&black);
+	    PlotIcon(&destRect, icon);
+	    ReleaseResource(icon);
+	}
     }
 
-    SetGWorld(saveWorld, saveDevice);
+    if (portChanged) {
+	QDSwapPort(savePort, NULL);
+    }
     return pix;
 }
 
@@ -180,94 +179,94 @@ TkpCreateNativeBitmap(
  *
  * TkpGetNativeAppBitmap --
  *
- *        Add native bitmaps.
+ *	Add native bitmaps.
  *
  * Results:
- *        A standard Tcl result.  If an error occurs then TCL_ERROR is
- *        returned and a message is left in the interp's result.
+ *	A standard Tcl result. If an error occurs then TCL_ERROR is
+ *	returned and a message is left in the interp's result.
  *
  * Side effects:
- *        "Name" is entered into the bitmap table and may be used from
- *        here on to refer to the given bitmap.
+ *	"Name" is entered into the bitmap table and may be used from
+ *	here on to refer to the given bitmap.
  *
  *----------------------------------------------------------------------
  */
 
 Pixmap
 TkpGetNativeAppBitmap(
-    Display *display,        /* The display. */
-    CONST char *name,        /* The name of the bitmap. */
-    int *width,                /* The width & height of the bitmap. */
+    Display *display,		/* The display. */
+    CONST char *name,		/* The name of the bitmap. */
+    int *width,			/* The width & height of the bitmap. */
     int *height)
 {
     Pixmap pix;
-    CGrafPtr saveWorld;
-    GDHandle saveDevice;
-    GWorldPtr destPort;
+    CGrafPtr savePort;
+    Boolean portChanged;
     Rect destRect;
     Handle resource;
     int type = -1, destWrote;
     Str255 nativeName;
-    
+    Tcl_Encoding encoding;
+
     /*
      * macRoman is the encoding that the resource fork uses.
      */
 
-    Tcl_UtfToExternal(NULL, Tcl_GetEncoding(NULL, "macRoman"), name,
-            strlen(name), 0, NULL, 
-            (char *) &nativeName[1],
-            255, NULL, &destWrote, NULL); /* Internalize native */
+    encoding = Tcl_GetEncoding(NULL, "macRoman");
+    Tcl_UtfToExternal(NULL, encoding, name, strlen(name), 0, NULL,
+	    (char *) &nativeName[1], 255, NULL, &destWrote, NULL);
     nativeName[0] = destWrote;
+    Tcl_FreeEncoding(encoding);
 
     resource = GetNamedResource('cicn', nativeName);
     if (resource != NULL) {
-        type = TYPE3;
+	type = TYPE3;
     } else {
-        resource = GetNamedResource('ICON', nativeName);
-        if (resource != NULL) {
-            type = TYPE2;
-        }
+	resource = GetNamedResource('ICON', nativeName);
+	if (resource != NULL) {
+	    type = TYPE2;
+	}
     }
-    
+
     if (resource == NULL) {
-        return (Pixmap) NULL;
+	return (Pixmap) NULL;
     }
-    
+
     pix = Tk_GetPixmap(display, None, 32, 32, 0);
-    destPort = TkMacOSXGetDrawablePort(pix);
+    portChanged = QDSwapPort(TkMacOSXGetDrawablePort(pix), &savePort);
 
-    GetGWorld(&saveWorld, &saveDevice);
-    SetGWorld(destPort, NULL);
-    
     SetRect(&destRect, 0, 0, 32, 32);
     if (type == TYPE2) {
-        RGBColor black = {0, 0, 0};
-        
-        RGBForeColor(&black);
-        PlotIcon(&destRect, resource);
-        ReleaseResource(resource);
+	RGBColor black = {0, 0, 0};
+
+	RGBForeColor(&black);
+	PlotIcon(&destRect, resource);
+	ReleaseResource(resource);
     } else if (type == TYPE3) {
-        RGBColor white = {0xFFFF, 0xFFFF, 0xFFFF};
-        short id;
-        ResType theType;
-        Str255 dummy;
-        
-        /*
-         * We need to first paint the background white.  Also, for
-         * some reason we *must* use GetCIcon instead of GetNamedResource
-         * for PlotCIcon to work - so we use GetResInfo to get the id.
-         */
-        RGBForeColor(&white);
-        PaintRect(&destRect);
-        GetResInfo(resource, &id, &theType, dummy);
-        ReleaseResource(resource);
-        resource = (Handle) GetCIcon(id);
-        PlotCIcon(&destRect, (CIconHandle) resource);
-        DisposeCIcon((CIconHandle) resource);
+	RGBColor white = {0xFFFF, 0xFFFF, 0xFFFF};
+	short id;
+	ResType theType;
+	Str255 dummy;
+
+	/*
+	 * We need to first paint the background white. Also, for
+	 * some reason we *must* use GetCIcon instead of GetNamedResource
+	 * for PlotCIcon to work - so we use GetResInfo to get the id.
+	 */
+
+	RGBForeColor(&white);
+	PaintRect(&destRect);
+	GetResInfo(resource, &id, &theType, dummy);
+	ReleaseResource(resource);
+	resource = (Handle) GetCIcon(id);
+	PlotCIcon(&destRect, (CIconHandle) resource);
+	DisposeCIcon((CIconHandle) resource);
     }
-    
+
     *width = 32;
     *height = 32;
-    SetGWorld(saveWorld, saveDevice);
+    if (portChanged) {
+	QDSwapPort(savePort, NULL);
+    }
     return pix;
 }