Merge of TkAqua Cocoa portmacosx_cocoa_merge

9 files changed, 80 insertions, 65 deletions

diff --git a/generic/tk.decls b/generic/tk.decls
index 2bfcd8c..c8b9e5e 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: tk.decls,v 1.47 2009/02/27 23:23:35 nijtmans Exp $
+# RCS: @(#) $Id: tk.decls,v 1.48 2009/06/29 14:35:01 das Exp $
 
 library tk
 
@@ -1148,10 +1148,10 @@ declare 6 aqua {
     void TkMacOSXInvalClipRgns(Tk_Window tkwin)
 }
 declare 7 aqua {
-    GWorldPtr TkMacOSXGetDrawablePort(Drawable drawable)
+    void *TkMacOSXGetDrawablePort(Drawable drawable)
 }
 declare 8 aqua {
-    ControlRef TkMacOSXGetRootControl(Drawable drawable)
+    void *TkMacOSXGetRootControl(Drawable drawable)
 }
 declare 9 aqua {
     void Tk_MacOSXSetupTkNotifier(void)
diff --git a/generic/tk.h b/generic/tk.h
index 006f44c..0ebd36b 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tk.h,v 1.129 2009/01/16 20:55:12 dgp Exp $
+ * RCS: @(#) $Id: tk.h,v 1.130 2009/06/29 14:35:01 das Exp $
  */
 
 #ifndef _TK
@@ -39,8 +39,7 @@ extern "C" {
  * unix/configure.in	(2 LOC Major, 2 LOC minor, 1 LOC patch)
  * win/configure.in	(as above)
  * README		(sections 0 and 1)
- * macosx/Wish.xcode/project.pbxproj (not patchlevel) 1 LOC
- * macosx/Wish-Common.xcconfig (not patchlevel) 1 LOC
+ * macosx/Tk-Common.xcconfig (not patchlevel) 1 LOC
  * win/README		(not patchlevel)
  * unix/README		(not patchlevel)
  * unix/tk.spec		(1 LOC patch)
diff --git a/generic/tkButton.c b/generic/tkButton.c
index fea680f..a0968bc 100644
--- a/generic/tkButton.c
+++ b/generic/tkButton.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkButton.c,v 1.34 2009/05/14 11:54:00 patthoyts Exp $
+ * RCS: @(#) $Id: tkButton.c,v 1.35 2009/06/29 14:35:01 das Exp $
  */
 
 #include "tkInt.h"
@@ -1800,9 +1800,15 @@ ButtonSelectImageProc(
 {
     register TkButton *butPtr = clientData;
 
+#ifdef MAC_OSX_TK
+    if (butPtr->tkwin != NULL) {
+	TkpComputeButtonGeometry(butPtr);
+    }
+#else
     /*
      * Don't recompute geometry: it's controlled by the primary image.
      */
+#endif
 
     if ((butPtr->flags & SELECTED) && (butPtr->tkwin != NULL)
 	    && Tk_IsMapped(butPtr->tkwin)
@@ -1841,9 +1847,15 @@ ButtonTristateImageProc(
 {
     register TkButton *butPtr = clientData;
 
+#ifdef MAC_OSX_TK
+    if (butPtr->tkwin != NULL) {
+	TkpComputeButtonGeometry(butPtr);
+    }
+#else
     /*
      * Don't recompute geometry: it's controlled by the primary image.
      */
+#endif
 
     if ((butPtr->flags & TRISTATED) && (butPtr->tkwin != NULL)
 	    && Tk_IsMapped(butPtr->tkwin)
diff --git a/generic/tkEntry.h b/generic/tkEntry.h
index 764049d..9ade3a6 100644
--- a/generic/tkEntry.h
+++ b/generic/tkEntry.h
@@ -6,7 +6,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * Copyright (c) 2002 Apple Computer, Inc.
+ * Copyright (c) 2002 Apple Inc.
  */
 
 #ifndef _TKENTRY
diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index 1f80028..48bfcd6 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkGrab.c,v 1.18 2009/02/03 23:55:47 nijtmans Exp $
+ * RCS: @(#) $Id: tkGrab.c,v 1.19 2009/06/29 14:35:01 das Exp $
  */
 
 #include "tkInt.h"
@@ -419,7 +419,12 @@ Tk_Grab(
     }
 
     Tk_MakeWindowExist(tkwin);
-    if (!grabGlobal) {
+#ifndef MAC_OSX_TK
+    if (!grabGlobal)
+#else
+    if (0)
+#endif
+    {
 	Window dummy1, dummy2;
 	int dummy3, dummy4, dummy5, dummy6;
 	unsigned int state;
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 504935f..41205ad 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: tkInt.decls,v 1.56 2009/06/27 19:33:35 nijtmans Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.57 2009/06/29 14:35:01 das Exp $
 
 library tk
 
@@ -836,22 +836,22 @@ declare 12 aqua {
 #}
 
 declare 14 aqua {
-    int TkMacOSXDoHLEvent(EventRecord *theEvent)
+    int TkMacOSXDoHLEvent(void *theEvent)
 }
 
 # removed duplicate from tkPlat table(tk.decls)
 #declare 15 aqua {
-#    GWorldPtr TkMacOSXGetDrawablePort(Drawable drawable)
+#    void *TkMacOSXGetDrawablePort(Drawable drawable)
 #}
 
 declare 16 aqua {
-    Window TkMacOSXGetXWindow(WindowRef macWinPtr)
+    Window TkMacOSXGetXWindow(void *macWinPtr)
 }
 declare 17 aqua {
-    int TkMacOSXGrowToplevel(WindowRef whichWindow, Point start)
+    int TkMacOSXGrowToplevel(void *whichWindow, XPoint start)
 }
 declare 18 aqua {
-    void TkMacOSXHandleMenuSelect(MenuID theMenu, MenuItemIndex theItem,
+    void TkMacOSXHandleMenuSelect(short theMenu, unsigned short theItem,
 	    int optionKeyPressed)
 }
 
@@ -874,13 +874,13 @@ declare 23 aqua {
     void TkMacOSXMakeRealWindowExist(TkWindow *winPtr)
 }
 declare 24 aqua {
-    BitMapPtr TkMacOSXMakeStippleMap(Drawable d1, Drawable d2)
+    void *TkMacOSXMakeStippleMap(Drawable d1, Drawable d2)
 }
 declare 25 aqua {
     void TkMacOSXMenuClick(void)
 }
 declare 26 aqua {
-    void TkMacOSXRegisterOffScreenWindow(Window window, GWorldPtr portPtr)
+    void TkMacOSXRegisterOffScreenWindow(Window window, void *portPtr)
 }
 declare 27 aqua {
     int TkMacOSXResizable(TkWindow *winPtr)
@@ -895,28 +895,28 @@ declare 30 aqua {
     void TkMacOSXSetUpClippingRgn(Drawable drawable)
 }
 declare 31 aqua {
-    void TkMacOSXSetUpGraphicsPort(GC gc, GWorldPtr destPort)
+    void TkMacOSXSetUpGraphicsPort(GC gc, void *destPort)
 }
 declare 32 aqua {
     void TkMacOSXUpdateClipRgn(TkWindow *winPtr)
 }
 declare 33 aqua {
-    void TkMacOSXUnregisterMacWindow(WindowRef portPtr)
+    void TkMacOSXUnregisterMacWindow(void *portPtr)
 }
 declare 34 aqua {
     int TkMacOSXUseMenuID(short macID)
 }
 declare 35 aqua {
-    RgnHandle TkMacOSXVisableClipRgn(TkWindow *winPtr)
+    TkRegion TkMacOSXVisableClipRgn(TkWindow *winPtr)
 }
 declare 36 aqua {
-    void TkMacOSXWinBounds(TkWindow *winPtr, Rect *geometry)
+    void TkMacOSXWinBounds(TkWindow *winPtr, void *geometry)
 }
 declare 37 aqua {
-    void TkMacOSXWindowOffset(WindowRef wRef, int *xOffset, int *yOffset)
+    void TkMacOSXWindowOffset(void *wRef, int *xOffset, int *yOffset)
 }
 declare 38 aqua {
-    int TkSetMacColor(unsigned long pixel, RGBColor *macColor)
+    int TkSetMacColor(unsigned long pixel, void *macColor)
 }
 declare 39 aqua {
     void TkSetWMName(TkWindow *winPtr, Tk_Uid titleUid)
@@ -925,7 +925,7 @@ declare 40 aqua {
     void TkSuspendClipboard(void)
 }
 declare 41 aqua {
-    int TkMacOSXZoomToplevel(WindowPtr whichWindow, short zoomPart)
+    int TkMacOSXZoomToplevel(void *whichWindow, short zoomPart)
 }
 declare 42 aqua {
     Tk_Window Tk_TopCoordsToWindow(Tk_Window tkwin, int rootX, int rootY,
@@ -941,7 +941,7 @@ declare 45 aqua {
     void TkMacOSXPreprocessMenu(void)
 }
 declare 46 aqua {
-    int TkpIsWindowFloating(WindowRef window)
+    int TkpIsWindowFloating(void *window)
 }
 declare 47 aqua {
     Tk_Window TkMacOSXGetCapture(void)
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 7b75731..8c26674 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.34 2008/10/22 20:56:43 nijtmans Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.35 2009/06/29 14:35:01 das Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -288,25 +288,25 @@ EXTERN void		TkMacOSXHandleTearoffMenu (void);
 #ifndef TkMacOSXDoHLEvent_TCL_DECLARED
 #define TkMacOSXDoHLEvent_TCL_DECLARED
 /* 14 */
-EXTERN int		TkMacOSXDoHLEvent (EventRecord * theEvent);
+EXTERN int		TkMacOSXDoHLEvent (void * theEvent);
 #endif
 /* Slot 15 is reserved */
 #ifndef TkMacOSXGetXWindow_TCL_DECLARED
 #define TkMacOSXGetXWindow_TCL_DECLARED
 /* 16 */
-EXTERN Window		TkMacOSXGetXWindow (WindowRef macWinPtr);
+EXTERN Window		TkMacOSXGetXWindow (void * macWinPtr);
 #endif
 #ifndef TkMacOSXGrowToplevel_TCL_DECLARED
 #define TkMacOSXGrowToplevel_TCL_DECLARED
 /* 17 */
-EXTERN int		TkMacOSXGrowToplevel (WindowRef whichWindow,
-				Point start);
+EXTERN int		TkMacOSXGrowToplevel (void * whichWindow,
+				XPoint start);
 #endif
 #ifndef TkMacOSXHandleMenuSelect_TCL_DECLARED
 #define TkMacOSXHandleMenuSelect_TCL_DECLARED
 /* 18 */
-EXTERN void		TkMacOSXHandleMenuSelect (MenuID theMenu,
-				MenuItemIndex theItem, int optionKeyPressed);
+EXTERN void		TkMacOSXHandleMenuSelect (short theMenu,
+				unsigned short theItem, int optionKeyPressed);
 #endif
 /* Slot 19 is reserved */
 /* Slot 20 is reserved */
@@ -330,7 +330,7 @@ EXTERN void		TkMacOSXMakeRealWindowExist (TkWindow * winPtr);
 #ifndef TkMacOSXMakeStippleMap_TCL_DECLARED
 #define TkMacOSXMakeStippleMap_TCL_DECLARED
 /* 24 */
-EXTERN BitMapPtr	TkMacOSXMakeStippleMap (Drawable d1, Drawable d2);
+EXTERN void *		TkMacOSXMakeStippleMap (Drawable d1, Drawable d2);
 #endif
 #ifndef TkMacOSXMenuClick_TCL_DECLARED
 #define TkMacOSXMenuClick_TCL_DECLARED
@@ -341,7 +341,7 @@ EXTERN void		TkMacOSXMenuClick (void);
 #define TkMacOSXRegisterOffScreenWindow_TCL_DECLARED
 /* 26 */
 EXTERN void		TkMacOSXRegisterOffScreenWindow (Window window,
-				GWorldPtr portPtr);
+				void * portPtr);
 #endif
 #ifndef TkMacOSXResizable_TCL_DECLARED
 #define TkMacOSXResizable_TCL_DECLARED
@@ -367,7 +367,7 @@ EXTERN void		TkMacOSXSetUpClippingRgn (Drawable drawable);
 #ifndef TkMacOSXSetUpGraphicsPort_TCL_DECLARED
 #define TkMacOSXSetUpGraphicsPort_TCL_DECLARED
 /* 31 */
-EXTERN void		TkMacOSXSetUpGraphicsPort (GC gc, GWorldPtr destPort);
+EXTERN void		TkMacOSXSetUpGraphicsPort (GC gc, void * destPort);
 #endif
 #ifndef TkMacOSXUpdateClipRgn_TCL_DECLARED
 #define TkMacOSXUpdateClipRgn_TCL_DECLARED
@@ -377,7 +377,7 @@ EXTERN void		TkMacOSXUpdateClipRgn (TkWindow * winPtr);
 #ifndef TkMacOSXUnregisterMacWindow_TCL_DECLARED
 #define TkMacOSXUnregisterMacWindow_TCL_DECLARED
 /* 33 */
-EXTERN void		TkMacOSXUnregisterMacWindow (WindowRef portPtr);
+EXTERN void		TkMacOSXUnregisterMacWindow (void * portPtr);
 #endif
 #ifndef TkMacOSXUseMenuID_TCL_DECLARED
 #define TkMacOSXUseMenuID_TCL_DECLARED
@@ -387,25 +387,24 @@ EXTERN int		TkMacOSXUseMenuID (short macID);
 #ifndef TkMacOSXVisableClipRgn_TCL_DECLARED
 #define TkMacOSXVisableClipRgn_TCL_DECLARED
 /* 35 */
-EXTERN RgnHandle	TkMacOSXVisableClipRgn (TkWindow * winPtr);
+EXTERN TkRegion		TkMacOSXVisableClipRgn (TkWindow * winPtr);
 #endif
 #ifndef TkMacOSXWinBounds_TCL_DECLARED
 #define TkMacOSXWinBounds_TCL_DECLARED
 /* 36 */
 EXTERN void		TkMacOSXWinBounds (TkWindow * winPtr,
-				Rect * geometry);
+				void * geometry);
 #endif
 #ifndef TkMacOSXWindowOffset_TCL_DECLARED
 #define TkMacOSXWindowOffset_TCL_DECLARED
 /* 37 */
-EXTERN void		TkMacOSXWindowOffset (WindowRef wRef, int * xOffset,
+EXTERN void		TkMacOSXWindowOffset (void * wRef, int * xOffset,
 				int * yOffset);
 #endif
 #ifndef TkSetMacColor_TCL_DECLARED
 #define TkSetMacColor_TCL_DECLARED
 /* 38 */
-EXTERN int		TkSetMacColor (unsigned long pixel,
-				RGBColor * macColor);
+EXTERN int		TkSetMacColor (unsigned long pixel, void * macColor);
 #endif
 #ifndef TkSetWMName_TCL_DECLARED
 #define TkSetWMName_TCL_DECLARED
@@ -420,7 +419,7 @@ EXTERN void		TkSuspendClipboard (void);
 #ifndef TkMacOSXZoomToplevel_TCL_DECLARED
 #define TkMacOSXZoomToplevel_TCL_DECLARED
 /* 41 */
-EXTERN int		TkMacOSXZoomToplevel (WindowPtr whichWindow,
+EXTERN int		TkMacOSXZoomToplevel (void * whichWindow,
 				short zoomPart);
 #endif
 #ifndef Tk_TopCoordsToWindow_TCL_DECLARED
@@ -447,7 +446,7 @@ EXTERN void		TkMacOSXPreprocessMenu (void);
 #ifndef TkpIsWindowFloating_TCL_DECLARED
 #define TkpIsWindowFloating_TCL_DECLARED
 /* 46 */
-EXTERN int		TkpIsWindowFloating (WindowRef window);
+EXTERN int		TkpIsWindowFloating (void * window);
 #endif
 #ifndef TkMacOSXGetCapture_TCL_DECLARED
 #define TkMacOSXGetCapture_TCL_DECLARED
@@ -599,39 +598,39 @@ typedef struct TkIntPlatStubs {
     void (*tkMacOSXInstallCursor) (int resizeOverride); /* 11 */
     void (*tkMacOSXHandleTearoffMenu) (void); /* 12 */
     void *reserved13;
-    int (*tkMacOSXDoHLEvent) (EventRecord * theEvent); /* 14 */
+    int (*tkMacOSXDoHLEvent) (void * theEvent); /* 14 */
     void *reserved15;
-    Window (*tkMacOSXGetXWindow) (WindowRef macWinPtr); /* 16 */
-    int (*tkMacOSXGrowToplevel) (WindowRef whichWindow, Point start); /* 17 */
-    void (*tkMacOSXHandleMenuSelect) (MenuID theMenu, MenuItemIndex theItem, int optionKeyPressed); /* 18 */
+    Window (*tkMacOSXGetXWindow) (void * macWinPtr); /* 16 */
+    int (*tkMacOSXGrowToplevel) (void * whichWindow, XPoint start); /* 17 */
+    void (*tkMacOSXHandleMenuSelect) (short theMenu, unsigned short theItem, int optionKeyPressed); /* 18 */
     void *reserved19;
     void *reserved20;
     void (*tkMacOSXInvalidateWindow) (MacDrawable * macWin, int flag); /* 21 */
     int (*tkMacOSXIsCharacterMissing) (Tk_Font tkfont, unsigned int searchChar); /* 22 */
     void (*tkMacOSXMakeRealWindowExist) (TkWindow * winPtr); /* 23 */
-    BitMapPtr (*tkMacOSXMakeStippleMap) (Drawable d1, Drawable d2); /* 24 */
+    void * (*tkMacOSXMakeStippleMap) (Drawable d1, Drawable d2); /* 24 */
     void (*tkMacOSXMenuClick) (void); /* 25 */
-    void (*tkMacOSXRegisterOffScreenWindow) (Window window, GWorldPtr portPtr); /* 26 */
+    void (*tkMacOSXRegisterOffScreenWindow) (Window window, void * portPtr); /* 26 */
     int (*tkMacOSXResizable) (TkWindow * winPtr); /* 27 */
     void (*tkMacOSXSetHelpMenuItemCount) (void); /* 28 */
     void (*tkMacOSXSetScrollbarGrow) (TkWindow * winPtr, int flag); /* 29 */
     void (*tkMacOSXSetUpClippingRgn) (Drawable drawable); /* 30 */
-    void (*tkMacOSXSetUpGraphicsPort) (GC gc, GWorldPtr destPort); /* 31 */
+    void (*tkMacOSXSetUpGraphicsPort) (GC gc, void * destPort); /* 31 */
     void (*tkMacOSXUpdateClipRgn) (TkWindow * winPtr); /* 32 */
-    void (*tkMacOSXUnregisterMacWindow) (WindowRef portPtr); /* 33 */
+    void (*tkMacOSXUnregisterMacWindow) (void * portPtr); /* 33 */
     int (*tkMacOSXUseMenuID) (short macID); /* 34 */
-    RgnHandle (*tkMacOSXVisableClipRgn) (TkWindow * winPtr); /* 35 */
-    void (*tkMacOSXWinBounds) (TkWindow * winPtr, Rect * geometry); /* 36 */
-    void (*tkMacOSXWindowOffset) (WindowRef wRef, int * xOffset, int * yOffset); /* 37 */
-    int (*tkSetMacColor) (unsigned long pixel, RGBColor * macColor); /* 38 */
+    TkRegion (*tkMacOSXVisableClipRgn) (TkWindow * winPtr); /* 35 */
+    void (*tkMacOSXWinBounds) (TkWindow * winPtr, void * geometry); /* 36 */
+    void (*tkMacOSXWindowOffset) (void * wRef, int * xOffset, int * yOffset); /* 37 */
+    int (*tkSetMacColor) (unsigned long pixel, void * macColor); /* 38 */
     void (*tkSetWMName) (TkWindow * winPtr, Tk_Uid titleUid); /* 39 */
     void (*tkSuspendClipboard) (void); /* 40 */
-    int (*tkMacOSXZoomToplevel) (WindowPtr whichWindow, short zoomPart); /* 41 */
+    int (*tkMacOSXZoomToplevel) (void * whichWindow, short zoomPart); /* 41 */
     Tk_Window (*tk_TopCoordsToWindow) (Tk_Window tkwin, int rootX, int rootY, int * newX, int * newY); /* 42 */
     MacDrawable * (*tkMacOSXContainerId) (TkWindow * winPtr); /* 43 */
     MacDrawable * (*tkMacOSXGetHostToplevel) (TkWindow * winPtr); /* 44 */
     void (*tkMacOSXPreprocessMenu) (void); /* 45 */
-    int (*tkpIsWindowFloating) (WindowRef window); /* 46 */
+    int (*tkpIsWindowFloating) (void * window); /* 46 */
     Tk_Window (*tkMacOSXGetCapture) (void); /* 47 */
     void *reserved48;
     Window (*tkGetTransientMaster) (TkWindow * winPtr); /* 49 */
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 448f78a..2d4b1f1 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkPlatDecls.h,v 1.19 2008/10/22 20:56:43 nijtmans Exp $
+ * RCS: @(#) $Id: tkPlatDecls.h,v 1.20 2009/06/29 14:35:01 das Exp $
  */
 
 #ifndef _TKPLATDECLS
@@ -110,12 +110,12 @@ EXTERN void		TkMacOSXInvalClipRgns (Tk_Window tkwin);
 #ifndef TkMacOSXGetDrawablePort_TCL_DECLARED
 #define TkMacOSXGetDrawablePort_TCL_DECLARED
 /* 7 */
-EXTERN GWorldPtr	TkMacOSXGetDrawablePort (Drawable drawable);
+EXTERN void *		TkMacOSXGetDrawablePort (Drawable drawable);
 #endif
 #ifndef TkMacOSXGetRootControl_TCL_DECLARED
 #define TkMacOSXGetRootControl_TCL_DECLARED
 /* 8 */
-EXTERN ControlRef	TkMacOSXGetRootControl (Drawable drawable);
+EXTERN void *		TkMacOSXGetRootControl (Drawable drawable);
 #endif
 #ifndef Tk_MacOSXSetupTkNotifier_TCL_DECLARED
 #define Tk_MacOSXSetupTkNotifier_TCL_DECLARED
@@ -149,8 +149,8 @@ typedef struct TkPlatStubs {
     void (*tkMacOSXInitAppleEvents) (Tcl_Interp * interp); /* 4 */
     void (*tkGenWMConfigureEvent) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 5 */
     void (*tkMacOSXInvalClipRgns) (Tk_Window tkwin); /* 6 */
-    GWorldPtr (*tkMacOSXGetDrawablePort) (Drawable drawable); /* 7 */
-    ControlRef (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
+    void * (*tkMacOSXGetDrawablePort) (Drawable drawable); /* 7 */
+    void * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
     void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */
     int (*tk_MacOSXIsAppInFront) (void); /* 10 */
 #endif /* AQUA */
diff --git a/generic/tkSelect.c b/generic/tkSelect.c
index 9a13e9a..da44ab8 100644
--- a/generic/tkSelect.c
+++ b/generic/tkSelect.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkSelect.c,v 1.28 2009/02/03 23:55:47 nijtmans Exp $
+ * RCS: @(#) $Id: tkSelect.c,v 1.29 2009/06/29 14:35:01 das Exp $
  */
 
 #include "tkInt.h"
@@ -1193,7 +1193,7 @@ TkSelInit(
      *	  http://www.cl.cam.ac.uk/~mgk25/unicode.html#x11
      */
 
-#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
+#if !defined(__WIN32__)
     dispPtr->utf8Atom		= Tk_InternAtom(tkwin, "UTF8_STRING");
 #else
     dispPtr->utf8Atom		= (Atom) NULL;