Tk Source Code
Check-in [ce392405]
Not logged in
Tcl 2016 Conference, Houston/TX, US, Nov 14-18
Send your abstracts to tclconference@googlegroups.com by Sep 12.

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
SHA1 Hash:ce392405f74c417b2c11fb96774b1e2d986ffcfd
Date: 2013-03-28 15:22:05
User: jan.nijtmans
Comment:Remove dead code. During 8.6 alpha/beta, Tk_DefineBitmap/Tk_GetBitmapFromData moved to stub entry 274/275 due to a signature change, but later that turned out not be necessary at all. The stub entries were kept in order not to lose binary compatibility for extensions that were compiled against beta 8.6 headers. Now that Tk 8.6 is final, this makes no sense any more.
Tags And Properties
Context
2013-03-29
08:47
[7b36f483] merge-mark (user: jan.nijtmans, tags: trunk)
2013-03-28
20:52
[ff4f5292] Closed-Leaf: Demonstrate how the Tk_Main() macro can use Tcl_InitSubsystems(), as fully equivalent replacement of Tcl_FindExecutable/Tcl_CreateInterp. (not part of TIP #414) (user: jan.nijtmans, tags: initsubsystems2)
15:22
[ce392405] Remove dead code. During 8.6 alpha/beta, Tk_DefineBitmap/Tk_GetBitmapFromData moved to stub entry 274/275 due to a signature change, but later that turned out not be necessary at all. The stub entries were kept in order not to lose binary compatibility for extensions that were compiled against beta 8.6 headers. Now that Tk 8.6 is final, this makes no sense any more. (user: jan.nijtmans, tags: trunk)
08:06
[3261a7f3] merge-mark (user: jan.nijtmans, tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tk.decls.

1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
declare 272 {
    void Tk_CreateOldImageType(const Tk_ImageType *typePtr)
}
declare 273 {
    void Tk_CreateOldPhotoImageFormat(const Tk_PhotoImageFormat *formatPtr)
}

declare 274 {
    void reserved274(void)
}
declare 275 {
    void reserved275(void)
}

# Define the platform specific public Tk interface.  These functions are
# only available on the designated platform.

interface tkPlat

################################
# Windows specific functions







<
<
<
<
<
<
<







1065
1066
1067
1068
1069
1070
1071







1072
1073
1074
1075
1076
1077
1078
declare 272 {
    void Tk_CreateOldImageType(const Tk_ImageType *typePtr)
}
declare 273 {
    void Tk_CreateOldPhotoImageFormat(const Tk_PhotoImageFormat *formatPtr)
}








# Define the platform specific public Tk interface.  These functions are
# only available on the designated platform.

interface tkPlat

################################
# Windows specific functions

Changes to generic/tkDecls.h.

856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
....
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
....
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
/* 271 */
EXTERN Tcl_Interp *	Tk_Interp(Tk_Window tkwin);
/* 272 */
EXTERN void		Tk_CreateOldImageType(const Tk_ImageType *typePtr);
/* 273 */
EXTERN void		Tk_CreateOldPhotoImageFormat(
				const Tk_PhotoImageFormat *formatPtr);
/* 274 */
EXTERN void		reserved274(void);
/* 275 */
EXTERN void		reserved275(void);

typedef struct {
    const struct TkPlatStubs *tkPlatStubs;
    const struct TkIntStubs *tkIntStubs;
    const struct TkIntPlatStubs *tkIntPlatStubs;
    const struct TkIntXlibStubs *tkIntXlibStubs;
} TkStubHooks;
................................................................................
    int (*tk_PhotoPutZoomedBlock) (Tcl_Interp *interp, Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 267 */
    int (*tk_PhotoSetSize) (Tcl_Interp *interp, Tk_PhotoHandle handle, int width, int height); /* 268 */
    long (*tk_GetUserInactiveTime) (Display *dpy); /* 269 */
    void (*tk_ResetUserInactiveTime) (Display *dpy); /* 270 */
    Tcl_Interp * (*tk_Interp) (Tk_Window tkwin); /* 271 */
    void (*tk_CreateOldImageType) (const Tk_ImageType *typePtr); /* 272 */
    void (*tk_CreateOldPhotoImageFormat) (const Tk_PhotoImageFormat *formatPtr); /* 273 */
    void (*reserved274) (void); /* 274 */
    void (*reserved275) (void); /* 275 */
} TkStubs;

#ifdef __cplusplus
extern "C" {
#endif
extern const TkStubs *tkStubsPtr;
#ifdef __cplusplus
................................................................................
	(tkStubsPtr->tk_ResetUserInactiveTime) /* 270 */
#define Tk_Interp \
	(tkStubsPtr->tk_Interp) /* 271 */
#define Tk_CreateOldImageType \
	(tkStubsPtr->tk_CreateOldImageType) /* 272 */
#define Tk_CreateOldPhotoImageFormat \
	(tkStubsPtr->tk_CreateOldPhotoImageFormat) /* 273 */
#define reserved274 \
	(tkStubsPtr->reserved274) /* 274 */
#define reserved275 \
	(tkStubsPtr->reserved275) /* 275 */

#endif /* defined(USE_TK_STUBS) */

/* !END!: Do not edit above this line. */

/* Functions that don't belong in the stub table */
#undef Tk_MainEx







<
<
<
<







 







<
<







 







<
<
<
<







856
857
858
859
860
861
862




863
864
865
866
867
868
869
....
1142
1143
1144
1145
1146
1147
1148


1149
1150
1151
1152
1153
1154
1155
....
1704
1705
1706
1707
1708
1709
1710




1711
1712
1713
1714
1715
1716
1717
/* 271 */
EXTERN Tcl_Interp *	Tk_Interp(Tk_Window tkwin);
/* 272 */
EXTERN void		Tk_CreateOldImageType(const Tk_ImageType *typePtr);
/* 273 */
EXTERN void		Tk_CreateOldPhotoImageFormat(
				const Tk_PhotoImageFormat *formatPtr);





typedef struct {
    const struct TkPlatStubs *tkPlatStubs;
    const struct TkIntStubs *tkIntStubs;
    const struct TkIntPlatStubs *tkIntPlatStubs;
    const struct TkIntXlibStubs *tkIntXlibStubs;
} TkStubHooks;
................................................................................
    int (*tk_PhotoPutZoomedBlock) (Tcl_Interp *interp, Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 267 */
    int (*tk_PhotoSetSize) (Tcl_Interp *interp, Tk_PhotoHandle handle, int width, int height); /* 268 */
    long (*tk_GetUserInactiveTime) (Display *dpy); /* 269 */
    void (*tk_ResetUserInactiveTime) (Display *dpy); /* 270 */
    Tcl_Interp * (*tk_Interp) (Tk_Window tkwin); /* 271 */
    void (*tk_CreateOldImageType) (const Tk_ImageType *typePtr); /* 272 */
    void (*tk_CreateOldPhotoImageFormat) (const Tk_PhotoImageFormat *formatPtr); /* 273 */


} TkStubs;

#ifdef __cplusplus
extern "C" {
#endif
extern const TkStubs *tkStubsPtr;
#ifdef __cplusplus
................................................................................
	(tkStubsPtr->tk_ResetUserInactiveTime) /* 270 */
#define Tk_Interp \
	(tkStubsPtr->tk_Interp) /* 271 */
#define Tk_CreateOldImageType \
	(tkStubsPtr->tk_CreateOldImageType) /* 272 */
#define Tk_CreateOldPhotoImageFormat \
	(tkStubsPtr->tk_CreateOldPhotoImageFormat) /* 273 */





#endif /* defined(USE_TK_STUBS) */

/* !END!: Do not edit above this line. */

/* Functions that don't belong in the stub table */
#undef Tk_MainEx

Changes to generic/tkStubInit.c.

222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
....
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
#	define TkRectInRegion (int (*) (TkRegion, int, int, unsigned int, unsigned int)) XRectInRegion
#	define TkSetRegion (void (*) (Display *, GC, TkRegion)) XSetRegion
#	define TkUnionRectWithRegion (void (*) (XRectangle *, TkRegion, TkRegion)) XUnionRectWithRegion
#	define TkSubtractRegion (void (*) (TkRegion, TkRegion, TkRegion)) XSubtractRegion
#   endif
#endif /* !__WIN32__ */

#define reserved274 (void (*)(void)) Tk_DefineBitmap
#define reserved275 (void (*)(void)) Tk_GetBitmapFromData

/*
 * WARNING: The contents of this file is automatically generated by the
 * tools/genStubs.tcl script. Any modifications to the function declarations
 * below should be made in the generic/tk.decls script.
 */

/* !BEGIN!: Do not edit below this line. */
................................................................................
    Tk_PhotoPutZoomedBlock, /* 267 */
    Tk_PhotoSetSize, /* 268 */
    Tk_GetUserInactiveTime, /* 269 */
    Tk_ResetUserInactiveTime, /* 270 */
    Tk_Interp, /* 271 */
    Tk_CreateOldImageType, /* 272 */
    Tk_CreateOldPhotoImageFormat, /* 273 */
    reserved274, /* 274 */
    reserved275, /* 275 */
};

/* !END!: Do not edit above this line. */







<
<
<







 







<
<



222
223
224
225
226
227
228



229
230
231
232
233
234
235
....
1099
1100
1101
1102
1103
1104
1105


1106
1107
1108
#	define TkRectInRegion (int (*) (TkRegion, int, int, unsigned int, unsigned int)) XRectInRegion
#	define TkSetRegion (void (*) (Display *, GC, TkRegion)) XSetRegion
#	define TkUnionRectWithRegion (void (*) (XRectangle *, TkRegion, TkRegion)) XUnionRectWithRegion
#	define TkSubtractRegion (void (*) (TkRegion, TkRegion, TkRegion)) XSubtractRegion
#   endif
#endif /* !__WIN32__ */




/*
 * WARNING: The contents of this file is automatically generated by the
 * tools/genStubs.tcl script. Any modifications to the function declarations
 * below should be made in the generic/tk.decls script.
 */

/* !BEGIN!: Do not edit below this line. */
................................................................................
    Tk_PhotoPutZoomedBlock, /* 267 */
    Tk_PhotoSetSize, /* 268 */
    Tk_GetUserInactiveTime, /* 269 */
    Tk_ResetUserInactiveTime, /* 270 */
    Tk_Interp, /* 271 */
    Tk_CreateOldImageType, /* 272 */
    Tk_CreateOldPhotoImageFormat, /* 273 */


};

/* !END!: Do not edit above this line. */