summaryrefslogtreecommitdiffstats
path: root/generic/tkPlatDecls.h
diff options
context:
space:
mode:
authorKevin Walzer <kw@codebykevin.com>2012-09-25 14:51:04 (GMT)
committerKevin Walzer <kw@codebykevin.com>2012-09-25 14:51:04 (GMT)
commit59e0055e5372987ed7f16557ff3eeb6f75512b98 (patch)
treedea6f020e98cf06efcef68e084c7a1787f87e140 /generic/tkPlatDecls.h
parentdbec27a4c7733b44e33ba898fef7e8636e86caa0 (diff)
parent1ccc0a498dc186888117726c326b68dde101af48 (diff)
downloadtk-59e0055e5372987ed7f16557ff3eeb6f75512b98.zip
tk-59e0055e5372987ed7f16557ff3eeb6f75512b98.tar.gz
tk-59e0055e5372987ed7f16557ff3eeb6f75512b98.tar.bz2
Merge Tk-Cocoa backport into core-8-5-branch
Diffstat (limited to 'generic/tkPlatDecls.h')
-rw-r--r--generic/tkPlatDecls.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 476fa4a..549ae30 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -108,12 +108,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
@@ -147,8 +147,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 */