tk.h   tk.h 
skipping to change at line 78 skipping to change at line 78
* unix/tk.spec (1 LOC patch) * unix/tk.spec (1 LOC patch)
* win/tcl.m4 (not patchlevel) * win/tcl.m4 (not patchlevel)
* *
* You may also need to update some of these files when the numbers change for * You may also need to update some of these files when the numbers change for
* the version of Tcl that this release of Tk is compiled against. * the version of Tcl that this release of Tk is compiled against.
*/ */
#define TK_MAJOR_VERSION 8 #define TK_MAJOR_VERSION 8
#define TK_MINOR_VERSION 6 #define TK_MINOR_VERSION 6
#define TK_RELEASE_LEVEL TCL_FINAL_RELEASE #define TK_RELEASE_LEVEL TCL_FINAL_RELEASE
#define TK_RELEASE_SERIAL 0 #define TK_RELEASE_SERIAL 2
#define TK_VERSION "8.6" #define TK_VERSION "8.6"
#define TK_PATCH_LEVEL "8.6.1" #define TK_PATCH_LEVEL "8.6.2"
/* /*
* A special definition used to allow this header file to be included from * A special definition used to allow this header file to be included from
* windows or mac resource files so that they can obtain version informatio n. * windows or mac resource files so that they can obtain version informatio n.
* RC_INVOKED is defined by default by the windows RC tool and manually set * RC_INVOKED is defined by default by the windows RC tool and manually set
* for macintosh. * for macintosh.
* *
* Resource compilers don't like all the C stuff, like typedefs and procedu re * Resource compilers don't like all the C stuff, like typedefs and procedu re
* declarations, that occur below, so block them out. * declarations, that occur below, so block them out.
*/ */
skipping to change at line 1484 skipping to change at line 1484
#define Tk_Sleep Tcl_Sleep #define Tk_Sleep Tcl_Sleep
/* Additional stuff that has moved to Tcl: */ /* Additional stuff that has moved to Tcl: */
#define Tk_EventuallyFree Tcl_EventuallyFree #define Tk_EventuallyFree Tcl_EventuallyFree
#define Tk_FreeProc Tcl_FreeProc #define Tk_FreeProc Tcl_FreeProc
#define Tk_Preserve Tcl_Preserve #define Tk_Preserve Tcl_Preserve
#define Tk_Release Tcl_Release #define Tk_Release Tcl_Release
/* Removed Tk_Main, use macro instead */ /* Removed Tk_Main, use macro instead */
#if defined(__WIN32__) || defined(__CYGWIN__) #if defined(_WIN32) || defined(__CYGWIN__)
#define Tk_Main(argc, argv, proc) Tk_MainEx(argc, argv, proc, \ #define Tk_Main(argc, argv, proc) Tk_MainEx(argc, argv, proc, \
(Tcl_FindExecutable(0), (Tcl_CreateInterp)())) (Tcl_FindExecutable(0), (Tcl_CreateInterp)()))
#else #else
#define Tk_Main(argc, argv, proc) Tk_MainEx(argc, argv, proc, \ #define Tk_Main(argc, argv, proc) Tk_MainEx(argc, argv, proc, \
(Tcl_FindExecutable(argv[0]), (Tcl_CreateInterp)())) (Tcl_FindExecutable(argv[0]), (Tcl_CreateInterp)()))
#endif #endif
const char * Tk_InitStubs(Tcl_Interp *interp, const char *version , const char * Tk_InitStubs(Tcl_Interp *interp, const char *version ,
int exact); int exact);
EXTERN const char * Tk_PkgInitStubsCheck(Tcl_Interp *interp, EXTERN const char * Tk_PkgInitStubsCheck(Tcl_Interp *interp,
const char *version, int exact); const char *version, int exact);
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 tkDecls.h   tkDecls.h 
skipping to change at line 28 skipping to change at line 28
#endif #endif
/* /*
* WARNING: This file is automatically generated by the tools/genStubs.tcl * WARNING: This file is automatically generated by the tools/genStubs.tcl
* script. Any modifications to the function declarations below should be made * script. Any modifications to the function declarations below should be made
* in the generic/tk.decls script. * in the generic/tk.decls script.
*/ */
/* !BEGIN!: Do not edit below this line. */ /* !BEGIN!: Do not edit below this line. */
#ifdef __cplusplus
extern "C" {
#endif
/* /*
* Exported function declarations: * Exported function declarations:
*/ */
/* 0 */ /* 0 */
EXTERN void Tk_MainLoop(void); EXTERN void Tk_MainLoop(void);
/* 1 */ /* 1 */
EXTERN XColor * Tk_3DBorderColor(Tk_3DBorder border); EXTERN XColor * Tk_3DBorderColor(Tk_3DBorder border);
/* 2 */ /* 2 */
EXTERN GC Tk_3DBorderGC(Tk_Window tkwin, Tk_3DBorder border, EXTERN GC Tk_3DBorderGC(Tk_Window tkwin, Tk_3DBorder border,
skipping to change at line 1151 skipping to change at line 1155
int (*tk_PhotoPutBlock) (Tcl_Interp *interp, Tk_PhotoHandle handle, Tk_ PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRul e); /* 266 */ int (*tk_PhotoPutBlock) (Tcl_Interp *interp, Tk_PhotoHandle handle, Tk_ PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRul e); /* 266 */
int (*tk_PhotoPutZoomedBlock) (Tcl_Interp *interp, Tk_PhotoHandle handl e, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int z oomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 267 */ int (*tk_PhotoPutZoomedBlock) (Tcl_Interp *interp, Tk_PhotoHandle handl e, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int z oomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 267 */
int (*tk_PhotoSetSize) (Tcl_Interp *interp, Tk_PhotoHandle handle, int width, int height); /* 268 */ int (*tk_PhotoSetSize) (Tcl_Interp *interp, Tk_PhotoHandle handle, int width, int height); /* 268 */
long (*tk_GetUserInactiveTime) (Display *dpy); /* 269 */ long (*tk_GetUserInactiveTime) (Display *dpy); /* 269 */
void (*tk_ResetUserInactiveTime) (Display *dpy); /* 270 */ void (*tk_ResetUserInactiveTime) (Display *dpy); /* 270 */
Tcl_Interp * (*tk_Interp) (Tk_Window tkwin); /* 271 */ Tcl_Interp * (*tk_Interp) (Tk_Window tkwin); /* 271 */
void (*tk_CreateOldImageType) (const Tk_ImageType *typePtr); /* 272 */ void (*tk_CreateOldImageType) (const Tk_ImageType *typePtr); /* 272 */
void (*tk_CreateOldPhotoImageFormat) (const Tk_PhotoImageFormat *format Ptr); /* 273 */ void (*tk_CreateOldPhotoImageFormat) (const Tk_PhotoImageFormat *format Ptr); /* 273 */
} TkStubs; } TkStubs;
#ifdef __cplusplus
extern "C" {
#endif
extern const TkStubs *tkStubsPtr; extern const TkStubs *tkStubsPtr;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#if defined(USE_TK_STUBS) #if defined(USE_TK_STUBS)
/* /*
* Inline function declarations: * Inline function declarations:
*/ */
 End of changes. 3 change blocks. 
3 lines changed or deleted 5 lines changed or added


 tkPlatDecls.h   tkPlatDecls.h 
skipping to change at line 32 skipping to change at line 32
* script. Any modifications to the function declarations below should be made * script. Any modifications to the function declarations below should be made
* in the generic/tk.decls script. * in the generic/tk.decls script.
*/ */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* !BEGIN!: Do not edit below this line. */ /* !BEGIN!: Do not edit below this line. */
#ifdef __cplusplus
extern "C" {
#endif
/* /*
* Exported function declarations: * Exported function declarations:
*/ */
#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ #if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
/* 0 */ /* 0 */
EXTERN Window Tk_AttachHWND(Tk_Window tkwin, HWND hwnd); EXTERN Window Tk_AttachHWND(Tk_Window tkwin, HWND hwnd);
/* 1 */ /* 1 */
EXTERN HINSTANCE Tk_GetHINSTANCE(void); EXTERN HINSTANCE Tk_GetHINSTANCE(void);
/* 2 */ /* 2 */
EXTERN HWND Tk_GetHWND(Window window); EXTERN HWND Tk_GetHWND(Window window);
/* 3 */ /* 3 */
EXTERN Tk_Window Tk_HWNDToWindow(HWND hwnd); EXTERN Tk_Window Tk_HWNDToWindow(HWND hwnd);
/* 4 */ /* 4 */
EXTERN void Tk_PointerEvent(HWND hwnd, int x, int y); EXTERN void Tk_PointerEvent(HWND hwnd, int x, int y);
skipping to change at line 87 skipping to change at line 91
/* 9 */ /* 9 */
EXTERN void Tk_MacOSXSetupTkNotifier(void); EXTERN void Tk_MacOSXSetupTkNotifier(void);
/* 10 */ /* 10 */
EXTERN int Tk_MacOSXIsAppInFront(void); EXTERN int Tk_MacOSXIsAppInFront(void);
#endif /* AQUA */ #endif /* AQUA */
typedef struct TkPlatStubs { typedef struct TkPlatStubs {
int magic; int magic;
void *hooks; void *hooks;
#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ #if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
Window (*tk_AttachHWND) (Tk_Window tkwin, HWND hwnd); /* 0 */ Window (*tk_AttachHWND) (Tk_Window tkwin, HWND hwnd); /* 0 */
HINSTANCE (*tk_GetHINSTANCE) (void); /* 1 */ HINSTANCE (*tk_GetHINSTANCE) (void); /* 1 */
HWND (*tk_GetHWND) (Window window); /* 2 */ HWND (*tk_GetHWND) (Window window); /* 2 */
Tk_Window (*tk_HWNDToWindow) (HWND hwnd); /* 3 */ Tk_Window (*tk_HWNDToWindow) (HWND hwnd); /* 3 */
void (*tk_PointerEvent) (HWND hwnd, int x, int y); /* 4 */ void (*tk_PointerEvent) (HWND hwnd, int x, int y); /* 4 */
int (*tk_TranslateWinEvent) (HWND hwnd, UINT message, WPARAM wParam, LP ARAM lParam, LRESULT *result); /* 5 */ int (*tk_TranslateWinEvent) (HWND hwnd, UINT message, WPARAM wParam, LP ARAM lParam, LRESULT *result); /* 5 */
#endif /* WIN */ #endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */ #ifdef MAC_OSX_TK /* AQUA */
void (*tk_MacOSXSetEmbedHandler) (Tk_MacOSXEmbedRegisterWinProc *regist erWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, Tk_MacOSXEmbed MakeContainerExistProc *containerExistProcPtr, Tk_MacOSXEmbedGetClipProc *g etClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc); /* 0 */ void (*tk_MacOSXSetEmbedHandler) (Tk_MacOSXEmbedRegisterWinProc *regist erWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, Tk_MacOSXEmbed MakeContainerExistProc *containerExistProcPtr, Tk_MacOSXEmbedGetClipProc *g etClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc); /* 0 */
void (*tk_MacOSXTurnOffMenus) (void); /* 1 */ void (*tk_MacOSXTurnOffMenus) (void); /* 1 */
skipping to change at line 110 skipping to change at line 114
void (*tkMacOSXInitAppleEvents) (Tcl_Interp *interp); /* 4 */ void (*tkMacOSXInitAppleEvents) (Tcl_Interp *interp); /* 4 */
void (*tkGenWMConfigureEvent) (Tk_Window tkwin, int x, int y, int width , int height, int flags); /* 5 */ void (*tkGenWMConfigureEvent) (Tk_Window tkwin, int x, int y, int width , int height, int flags); /* 5 */
void (*tkMacOSXInvalClipRgns) (Tk_Window tkwin); /* 6 */ void (*tkMacOSXInvalClipRgns) (Tk_Window tkwin); /* 6 */
void * (*tkMacOSXGetDrawablePort) (Drawable drawable); /* 7 */ void * (*tkMacOSXGetDrawablePort) (Drawable drawable); /* 7 */
void * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */ void * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */ void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */
int (*tk_MacOSXIsAppInFront) (void); /* 10 */ int (*tk_MacOSXIsAppInFront) (void); /* 10 */
#endif /* AQUA */ #endif /* AQUA */
} TkPlatStubs; } TkPlatStubs;
#ifdef __cplusplus
extern "C" {
#endif
extern const TkPlatStubs *tkPlatStubsPtr; extern const TkPlatStubs *tkPlatStubsPtr;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#if defined(USE_TK_STUBS) #if defined(USE_TK_STUBS)
/* /*
* Inline function declarations: * Inline function declarations:
*/ */
#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ #if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
#define Tk_AttachHWND \ #define Tk_AttachHWND \
(tkPlatStubsPtr->tk_AttachHWND) /* 0 */ (tkPlatStubsPtr->tk_AttachHWND) /* 0 */
#define Tk_GetHINSTANCE \ #define Tk_GetHINSTANCE \
(tkPlatStubsPtr->tk_GetHINSTANCE) /* 1 */ (tkPlatStubsPtr->tk_GetHINSTANCE) /* 1 */
#define Tk_GetHWND \ #define Tk_GetHWND \
(tkPlatStubsPtr->tk_GetHWND) /* 2 */ (tkPlatStubsPtr->tk_GetHWND) /* 2 */
#define Tk_HWNDToWindow \ #define Tk_HWNDToWindow \
(tkPlatStubsPtr->tk_HWNDToWindow) /* 3 */ (tkPlatStubsPtr->tk_HWNDToWindow) /* 3 */
#define Tk_PointerEvent \ #define Tk_PointerEvent \
(tkPlatStubsPtr->tk_PointerEvent) /* 4 */ (tkPlatStubsPtr->tk_PointerEvent) /* 4 */
 End of changes. 6 change blocks. 
6 lines changed or deleted 8 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/