Merge of TkAqua Cocoa portmacosx_cocoa_merge

1 files changed, 7 insertions, 9 deletions

diff --git a/macosx/tkMacOSX.h b/macosx/tkMacOSX.h
index 4b92458..95eafd1 100644
--- a/macosx/tkMacOSX.h
+++ b/macosx/tkMacOSX.h
@@ -4,13 +4,13 @@
  *	Declarations of Macintosh specific exported variables and procedures.
  *
  * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- * Copyright 2001, Apple Computer, Inc.
- * Copyright (c) 2005-2007 Daniel A. Steffen <das@users.sourceforge.net>
+ * Copyright 2001-2009, Apple Inc.
+ * Copyright (c) 2005-2009 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: tkMacOSX.h,v 1.5 2007/04/23 21:24:32 das Exp $
+ * RCS: @(#) $Id: tkMacOSX.h,v 1.6 2009/06/29 14:35:01 das Exp $
  */
 
 #ifndef _TKMAC
@@ -20,18 +20,16 @@
 #include "tk.h"
 #endif
 
-#include <Carbon/Carbon.h>
-
 /*
  * Structures and function types for handling Netscape-type in process
  * embedding where Tk does not control the top-level
  */
 
-typedef int (Tk_MacOSXEmbedRegisterWinProc) (int winID, Tk_Window window);
-typedef GWorldPtr (Tk_MacOSXEmbedGetGrafPortProc) (Tk_Window window);
+typedef int (Tk_MacOSXEmbedRegisterWinProc) (long winID, Tk_Window window);
+typedef void* (Tk_MacOSXEmbedGetGrafPortProc) (Tk_Window window);
 typedef int (Tk_MacOSXEmbedMakeContainerExistProc) (Tk_Window window);
-typedef void (Tk_MacOSXEmbedGetClipProc) (Tk_Window window, RgnHandle rgn);
-typedef void (Tk_MacOSXEmbedGetOffsetInParentProc) (Tk_Window window, Point *ulCorner);
+typedef void (Tk_MacOSXEmbedGetClipProc) (Tk_Window window, TkRegion rgn);
+typedef void (Tk_MacOSXEmbedGetOffsetInParentProc) (Tk_Window window, void *ulCorner);
 
 #include "tkPlatDecls.h"