diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-08 09:19:00 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-08 09:19:00 (GMT) |
| commit | 084797b718b0d03429fabc4997ff3f9695f9bd24 (patch) | |
| tree | d2494edb29ebd5494e65b953451dc8d43cd73c43 /generic/tkStubInit.c | |
| parent | c1d50f8302f80ab1939467c61bea379dd6035b1d (diff) | |
| parent | c2a305b8ed5e188557828ca1fc623f00f180e534 (diff) | |
| download | tk-084797b718b0d03429fabc4997ff3f9695f9bd24.zip tk-084797b718b0d03429fabc4997ff3f9695f9bd24.tar.gz tk-084797b718b0d03429fabc4997ff3f9695f9bd24.tar.bz2 | |
Merge 8.6. Rename some functions
Diffstat (limited to 'generic/tkStubInit.c')
| -rw-r--r-- | generic/tkStubInit.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index e0c4c93..686fa80 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -24,6 +24,7 @@ #if defined(MAC_OSX_TK) /* we could have used _TKMACINT */ #include "tkMacOSXInt.h" +#include "tkMacOSXPrivate.h" #endif /* TODO: These ought to come in some other way */ @@ -104,6 +105,7 @@ static Tk_Style Tk_GetStyleFromObj(Tcl_Obj *obj) #define TkpTestsendCmd_ TkpTestsendCmd #define TkGenWMConfigureEvent_ TkGenWMConfigureEvent #define TkGenerateActivateEvents_ TkGenerateActivateEvents +#define TkMacOSXDrawable Tk_MacOSXGetNSWindowForDrawable #define Tk_CanvasTagsParseProc \ (int (*) (void *, Tcl_Interp *,Tk_Window, const char *, char *, \ int offset))(void *)TkCanvasTagsParseProc @@ -111,6 +113,7 @@ static Tk_Style Tk_GetStyleFromObj(Tcl_Obj *obj) (const char *(*) (void *,Tk_Window, char *, int, \ Tcl_FreeProc **))(void *)TkCanvasTagsPrintProc + #ifdef _WIN32 int @@ -1026,12 +1029,18 @@ static const TkPlatStubs tkPlatStubs = { 0, /* 2 */ 0, /* 3 */ TkMacOSXInitAppleEvents, /* 4 */ - TkGenWMConfigureEvent, /* 5 */ + TkGenWMConfigureEvent_, /* 5 */ TkMacOSXInvalClipRgns, /* 6 */ 0, /* 7 */ TkMacOSXGetRootControl, /* 8 */ Tk_MacOSXSetupTkNotifier, /* 9 */ Tk_MacOSXIsAppInFront, /* 10 */ + Tk_MacOSXGetTkWindow, /* 11 */ + Tk_MacOSXGetCGContextForDrawable, /* 12 */ + Tk_MacOSXGetNSWindowForDrawable, /* 13 */ + 0, /* 14 */ + 0, /* 15 */ + TkGenWMConfigureEvent, /* 16 */ #endif /* AQUA */ }; |