diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2012-09-12 03:05:29 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2012-09-12 03:05:29 (GMT) |
| commit | 4d00df90e7901e55bc22ae2b9589a9c005f6d9f7 (patch) | |
| tree | 531b9edd57ee78802a71cb6c0fd09a0367f59211 /macosx/tkMacOSX.h | |
| parent | 799666382d309825a9bd5d7205fd05662a742391 (diff) | |
| download | tk-4d00df90e7901e55bc22ae2b9589a9c005f6d9f7.zip tk-4d00df90e7901e55bc22ae2b9589a9c005f6d9f7.tar.gz tk-4d00df90e7901e55bc22ae2b9589a9c005f6d9f7.tar.bz2 | |
Review branch for merge of Tk-Cocoa into Tk 8.5 main branch
Diffstat (limited to 'macosx/tkMacOSX.h')
| -rw-r--r-- | macosx/tkMacOSX.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/macosx/tkMacOSX.h b/macosx/tkMacOSX.h index a2a35a5..4ae9920 100644 --- a/macosx/tkMacOSX.h +++ b/macosx/tkMacOSX.h @@ -4,11 +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$ */ #ifndef _TKMAC @@ -18,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" |