summaryrefslogtreecommitdiffstats
path: root/generic/ttk
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-06-22 07:53:59 (GMT)
committernijtmans <nijtmans>2010-06-22 07:53:59 (GMT)
commitaf5c7cf0c34274560634e544d70228d63ed259d9 (patch)
tree8defac8745fa63b13a7bb799c372f4501e271193 /generic/ttk
parentd1c5374bb608709386205d4b61bef1578672e71d (diff)
downloadtk-af5c7cf0c34274560634e544d70228d63ed259d9.zip
tk-af5c7cf0c34274560634e544d70228d63ed259d9.tar.gz
tk-af5c7cf0c34274560634e544d70228d63ed259d9.tar.bz2
[Bug #3019363] "make genstubs" failure
(undid previous unintended edit)
Diffstat (limited to 'generic/ttk')
-rw-r--r--generic/ttk/ttkDecls.h22
-rw-r--r--generic/ttk/ttkGenStubs.tcl4
2 files changed, 13 insertions, 13 deletions
diff --git a/generic/ttk/ttkDecls.h b/generic/ttk/ttkDecls.h
index 93ea297..cc4809d 100644
--- a/generic/ttk/ttkDecls.h
+++ b/generic/ttk/ttkDecls.h
@@ -1,5 +1,5 @@
/*
- * $Id: ttkDecls.h,v 1.13 2010/06/22 07:41:17 nijtmans Exp $
+ * $Id: ttkDecls.h,v 1.14 2010/06/22 07:53:59 nijtmans Exp $
*
* This file is (mostly) automatically generated from ttk.decls.
*/
@@ -150,17 +150,17 @@ typedef struct TtkStubs {
Ttk_ElementClass * (*ttk_RegisterElement) (Tcl_Interp *interp, Ttk_Theme theme, const char *elementName, Ttk_ElementSpec *elementSpec, void *clientData); /* 6 */
int (*ttk_RegisterElementFactory) (Tcl_Interp *interp, const char *name, Ttk_ElementFactory factoryProc, void *clientData); /* 7 */
void (*ttk_RegisterLayout) (Ttk_Theme theme, const char *className, Ttk_LayoutSpec layoutSpec); /* 8 */
- void *reserved9;
+ void (*reserved9)(void);
int (*ttk_GetStateSpecFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Ttk_StateSpec *spec_rtn); /* 10 */
Tcl_Obj * (*ttk_NewStateSpecObj) (unsigned int onbits, unsigned int offbits); /* 11 */
Ttk_StateMap (*ttk_GetStateMapFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 12 */
Tcl_Obj * (*ttk_StateMapLookup) (Tcl_Interp *interp, Ttk_StateMap map, Ttk_State state); /* 13 */
int (*ttk_StateTableLookup) (Ttk_StateTable map[], Ttk_State state); /* 14 */
- void *reserved15;
- void *reserved16;
- void *reserved17;
- void *reserved18;
- void *reserved19;
+ void (*reserved15)(void);
+ void (*reserved16)(void);
+ void (*reserved17)(void);
+ void (*reserved18)(void);
+ void (*reserved19)(void);
int (*ttk_GetPaddingFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, Ttk_Padding *pad_rtn); /* 20 */
int (*ttk_GetBorderFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Ttk_Padding *pad_rtn); /* 21 */
int (*ttk_GetStickyFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Ttk_Sticky *sticky_rtn); /* 22 */
@@ -177,10 +177,10 @@ typedef struct TtkStubs {
Ttk_Box (*ttk_ExpandBox) (Ttk_Box b, Ttk_Padding p); /* 33 */
Ttk_Box (*ttk_PlaceBox) (Ttk_Box *cavity, int w, int h, Ttk_Side side, Ttk_Sticky sticky); /* 34 */
Tcl_Obj * (*ttk_NewBoxObj) (Ttk_Box box); /* 35 */
- void *reserved36;
- void *reserved37;
- void *reserved38;
- void *reserved39;
+ void (*reserved36)(void);
+ void (*reserved37)(void);
+ void (*reserved38)(void);
+ void (*reserved39)(void);
int (*ttk_GetOrientFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *orient); /* 40 */
} TtkStubs;
diff --git a/generic/ttk/ttkGenStubs.tcl b/generic/ttk/ttkGenStubs.tcl
index b5fc3b3..359edcc 100644
--- a/generic/ttk/ttkGenStubs.tcl
+++ b/generic/ttk/ttkGenStubs.tcl
@@ -8,7 +8,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# $Id: ttkGenStubs.tcl,v 1.7 2010/06/22 07:41:17 nijtmans Exp $
+# $Id: ttkGenStubs.tcl,v 1.8 2010/06/22 07:53:59 nijtmans Exp $
#
# SOURCE: tcl/tools/genStubs.tcl, revision 1.20
#
@@ -297,7 +297,7 @@ proc genStubs::addPlatformGuard {plat text} {
proc genStubs::emitSlots {name textVar} {
upvar $textVar text
- forAllStubs $name makeSlot noGuard text {" void *reserved$i;\n"}
+ forAllStubs $name makeSlot noGuard text {" void (*reserved$i)(void);\n"}
return
}