summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan <jan>2011-03-27 20:09:32 (GMT)
committerjan <jan>2011-03-27 20:09:32 (GMT)
commit1c27734166504eba34c85ec8a991874ca4cd224f (patch)
tree244693d22274f5f16f41720017bb49431e06fec2
parent51f9be40bc41cd08e38965b2c52f3323e6320008 (diff)
downloadtk-1c27734166504eba34c85ec8a991874ca4cd224f.zip
tk-1c27734166504eba34c85ec8a991874ca4cd224f.tar.gz
tk-1c27734166504eba34c85ec8a991874ca4cd224f.tar.bz2
fix genStubs.tcl in one place where it generated "void *" in stead of "VOID *"
-rw-r--r--generic/tkDecls.h4
-rw-r--r--generic/tkIntDecls.h100
-rw-r--r--generic/tkIntPlatDecls.h18
-rw-r--r--generic/tkIntXlibDecls.h2
4 files changed, 62 insertions, 62 deletions
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 953925e..d224a9b 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -1906,8 +1906,8 @@ typedef struct TkStubs {
void (*tk_InitConsoleChannels) (Tcl_Interp *interp); /* 215 */
int (*tk_CreateConsoleWindow) (Tcl_Interp *interp); /* 216 */
void (*tk_CreateSmoothMethod) (Tcl_Interp *interp, Tk_SmoothMethod *method); /* 217 */
- void *reserved218;
- void *reserved219;
+ VOID *reserved218;
+ VOID *reserved219;
int (*tk_GetDash) (Tcl_Interp *interp, CONST char *value, Tk_Dash *dash); /* 220 */
void (*tk_CreateOutline) (Tk_Outline *outline); /* 221 */
void (*tk_DeleteOutline) (Display *display, Tk_Outline *outline); /* 222 */
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 8ca2698..9ef1f87 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -1129,7 +1129,7 @@ typedef struct TkIntStubs {
void (*tkSelEventProc) (Tk_Window tkwin, XEvent *eventPtr); /* 81 */
void (*tkSelInit) (Tk_Window tkwin); /* 82 */
void (*tkSelPropProc) (XEvent *eventPtr); /* 83 */
- void *reserved84;
+ VOID *reserved84;
void (*tkSetWindowMenuBar) (Tcl_Interp *interp, Tk_Window tkwin, char *oldMenuName, char *menuName); /* 85 */
KeySym (*tkStringToKeysym) (char *name); /* 86 */
int (*tkThickPolyLineToArea) (double *coordPtr, int numPoints, double width, int capStyle, int joinStyle, double *rectPtr); /* 87 */
@@ -1159,117 +1159,117 @@ typedef struct TkIntStubs {
Tcl_Obj * (*tkpGetSystemDefault) (Tk_Window tkwin, CONST char *dbName, CONST char *className); /* 111 */
void (*tkpMenuThreadInit) (void); /* 112 */
#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
- void *reserved113;
+ VOID *reserved113;
#endif /* X11 */
#ifdef __WIN32__ /* WIN */
void (*tkClipBox) (TkRegion rgn, XRectangle *rect_return); /* 113 */
#endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */
- void *reserved113; /* Dummy entry for stubs table backwards compatibility */
+ VOID *reserved113; /* Dummy entry for stubs table backwards compatibility */
void (*tkClipBox) (TkRegion rgn, XRectangle *rect_return); /* 113 */
#endif /* AQUA */
#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
- void *reserved114;
+ VOID *reserved114;
#endif /* X11 */
#ifdef __WIN32__ /* WIN */
TkRegion (*tkCreateRegion) (void); /* 114 */
#endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */
- void *reserved114; /* Dummy entry for stubs table backwards compatibility */
+ VOID *reserved114; /* Dummy entry for stubs table backwards compatibility */
TkRegion (*tkCreateRegion) (void); /* 114 */
#endif /* AQUA */
#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
- void *reserved115;
+ VOID *reserved115;
#endif /* X11 */
#ifdef __WIN32__ /* WIN */
void (*tkDestroyRegion) (TkRegion rgn); /* 115 */
#endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */
- void *reserved115; /* Dummy entry for stubs table backwards compatibility */
+ VOID *reserved115; /* Dummy entry for stubs table backwards compatibility */
void (*tkDestroyRegion) (TkRegion rgn); /* 115 */
#endif /* AQUA */
#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
- void *reserved116;
+ VOID *reserved116;
#endif /* X11 */
#ifdef __WIN32__ /* WIN */
void (*tkIntersectRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 116 */
#endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */
- void *reserved116; /* Dummy entry for stubs table backwards compatibility */
+ VOID *reserved116; /* Dummy entry for stubs table backwards compatibility */
void (*tkIntersectRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 116 */
#endif /* AQUA */
#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
- void *reserved117;
+ VOID *reserved117;
#endif /* X11 */
#ifdef __WIN32__ /* WIN */
int (*tkRectInRegion) (TkRegion rgn, int x, int y, unsigned int width, unsigned int height); /* 117 */
#endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */
- void *reserved117; /* Dummy entry for stubs table backwards compatibility */
+ VOID *reserved117; /* Dummy entry for stubs table backwards compatibility */
int (*tkRectInRegion) (TkRegion rgn, int x, int y, unsigned int width, unsigned int height); /* 117 */
#endif /* AQUA */
#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
- void *reserved118;
+ VOID *reserved118;
#endif /* X11 */
#ifdef __WIN32__ /* WIN */
void (*tkSetRegion) (Display *display, GC gc, TkRegion rgn); /* 118 */
#endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */
- void *reserved118; /* Dummy entry for stubs table backwards compatibility */
+ VOID *reserved118; /* Dummy entry for stubs table backwards compatibility */
void (*tkSetRegion) (Display *display, GC gc, TkRegion rgn); /* 118 */
#endif /* AQUA */
#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
- void *reserved119;
+ VOID *reserved119;
#endif /* X11 */
#ifdef __WIN32__ /* WIN */
void (*tkUnionRectWithRegion) (XRectangle *rect, TkRegion src, TkRegion dr_return); /* 119 */
#endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */
- void *reserved119; /* Dummy entry for stubs table backwards compatibility */
+ VOID *reserved119; /* Dummy entry for stubs table backwards compatibility */
void (*tkUnionRectWithRegion) (XRectangle *rect, TkRegion src, TkRegion dr_return); /* 119 */
#endif /* AQUA */
- void *reserved120;
+ VOID *reserved120;
#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
- void *reserved121;
+ VOID *reserved121;
#endif /* X11 */
#ifdef __WIN32__ /* WIN */
- void *reserved121;
+ VOID *reserved121;
#endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */
- void *reserved121; /* Dummy entry for stubs table backwards compatibility */
+ VOID *reserved121; /* Dummy entry for stubs table backwards compatibility */
Pixmap (*tkpCreateNativeBitmap) (Display *display, CONST char *source); /* 121 */
#endif /* AQUA */
#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
- void *reserved122;
+ VOID *reserved122;
#endif /* X11 */
#ifdef __WIN32__ /* WIN */
- void *reserved122;
+ VOID *reserved122;
#endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */
- void *reserved122; /* Dummy entry for stubs table backwards compatibility */
+ VOID *reserved122; /* Dummy entry for stubs table backwards compatibility */
void (*tkpDefineNativeBitmaps) (void); /* 122 */
#endif /* AQUA */
- void *reserved123;
+ VOID *reserved123;
#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
- void *reserved124;
+ VOID *reserved124;
#endif /* X11 */
#ifdef __WIN32__ /* WIN */
- void *reserved124;
+ VOID *reserved124;
#endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */
- void *reserved124; /* Dummy entry for stubs table backwards compatibility */
+ VOID *reserved124; /* Dummy entry for stubs table backwards compatibility */
Pixmap (*tkpGetNativeAppBitmap) (Display *display, CONST char *name, int *width, int *height); /* 124 */
#endif /* AQUA */
- void *reserved125;
- void *reserved126;
- void *reserved127;
- void *reserved128;
- void *reserved129;
- void *reserved130;
- void *reserved131;
- void *reserved132;
- void *reserved133;
- void *reserved134;
+ VOID *reserved125;
+ VOID *reserved126;
+ VOID *reserved127;
+ VOID *reserved128;
+ VOID *reserved129;
+ VOID *reserved130;
+ VOID *reserved131;
+ VOID *reserved132;
+ VOID *reserved133;
+ VOID *reserved134;
void (*tkpDrawHighlightBorder) (Tk_Window tkwin, GC fgGC, GC bgGC, int highlightWidth, Drawable drawable); /* 135 */
void (*tkSetFocusWin) (TkWindow *winPtr, int force); /* 136 */
void (*tkpSetKeycodeAndState) (Tk_Window tkwin, KeySym keySym, XEvent *eventPtr); /* 137 */
@@ -1281,13 +1281,13 @@ typedef struct TkIntStubs {
void (*tkClipCleanup) (TkDisplay *dispPtr); /* 143 */
void (*tkGCCleanup) (TkDisplay *dispPtr); /* 144 */
#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
- void *reserved145;
+ VOID *reserved145;
#endif /* X11 */
#ifdef __WIN32__ /* WIN */
void (*tkSubtractRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 145 */
#endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */
- void *reserved145; /* Dummy entry for stubs table backwards compatibility */
+ VOID *reserved145; /* Dummy entry for stubs table backwards compatibility */
void (*tkSubtractRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 145 */
#endif /* AQUA */
void (*tkStylePkgInit) (TkMainInfo *mainPtr); /* 146 */
@@ -1299,20 +1299,20 @@ typedef struct TkIntStubs {
void (*tkpDrawFrame) (Tk_Window tkwin, Tk_3DBorder border, int highlightWidth, int borderWidth, int relief); /* 152 */
void (*tkCreateThreadExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 153 */
void (*tkDeleteThreadExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 154 */
- void *reserved155;
+ VOID *reserved155;
int (*tkpTestembedCmd) (ClientData clientData, Tcl_Interp *interp, int argc, CONST char **argv); /* 156 */
int (*tkpTesttextCmd) (ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv); /* 157 */
- void *reserved158;
- void *reserved159;
- void *reserved160;
- void *reserved161;
- void *reserved162;
- void *reserved163;
- void *reserved164;
- void *reserved165;
- void *reserved166;
- void *reserved167;
- void *reserved168;
+ VOID *reserved158;
+ VOID *reserved159;
+ VOID *reserved160;
+ VOID *reserved161;
+ VOID *reserved162;
+ VOID *reserved163;
+ VOID *reserved164;
+ VOID *reserved165;
+ VOID *reserved166;
+ VOID *reserved167;
+ VOID *reserved168;
int (*tkStateParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 169 */
char * (*tkStatePrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 170 */
int (*tkCanvasDashParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 171 */
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 22f7b37..c1bec7b 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -562,7 +562,7 @@ typedef struct TkIntPlatStubs {
#ifdef __WIN32__ /* WIN */
char * (*tkAlignImageData) (XImage *image, int alignment, int bitOrder); /* 0 */
- void *reserved1;
+ VOID *reserved1;
void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 2 */
unsigned long (*tkpGetMS) (void); /* 3 */
void (*tkPointerDeadWindow) (TkWindow *winPtr); /* 4 */
@@ -601,8 +601,8 @@ typedef struct TkIntPlatStubs {
#endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */
void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 0 */
- void *reserved1;
- void *reserved2;
+ VOID *reserved1;
+ VOID *reserved2;
void (*tkPointerDeadWindow) (TkWindow *winPtr); /* 3 */
void (*tkpSetCapture) (TkWindow *winPtr); /* 4 */
void (*tkpSetCursor) (TkpCursor cursor); /* 5 */
@@ -613,14 +613,14 @@ typedef struct TkIntPlatStubs {
int (*tkMacOSXDispatchMenuEvent) (int menuID, int index); /* 10 */
void (*tkMacOSXInstallCursor) (int resizeOverride); /* 11 */
void (*tkMacOSXHandleTearoffMenu) (void); /* 12 */
- void *reserved13;
+ VOID *reserved13;
int (*tkMacOSXDoHLEvent) (EventRecord *theEvent); /* 14 */
- void *reserved15;
+ VOID *reserved15;
Window (*tkMacOSXGetXWindow) (WindowRef macWinPtr); /* 16 */
int (*tkMacOSXGrowToplevel) (WindowRef whichWindow, Point start); /* 17 */
void (*tkMacOSXHandleMenuSelect) (MenuID theMenu, MenuItemIndex theItem, int optionKeyPressed); /* 18 */
- void *reserved19;
- void *reserved20;
+ VOID *reserved19;
+ VOID *reserved20;
void (*tkMacOSXInvalidateWindow) (MacDrawable *macWin, int flag); /* 21 */
int (*tkMacOSXIsCharacterMissing) (Tk_Font tkfont, unsigned int searchChar); /* 22 */
void (*tkMacOSXMakeRealWindowExist) (TkWindow *winPtr); /* 23 */
@@ -648,11 +648,11 @@ typedef struct TkIntPlatStubs {
void (*tkMacOSXPreprocessMenu) (void); /* 45 */
int (*tkpIsWindowFloating) (WindowRef window); /* 46 */
Tk_Window (*tkMacOSXGetCapture) (void); /* 47 */
- void *reserved48;
+ VOID *reserved48;
Window (*tkGetTransientMaster) (TkWindow *winPtr); /* 49 */
int (*tkGenerateButtonEvent) (int x, int y, Window window, unsigned int state); /* 50 */
void (*tkGenWMDestroyEvent) (Tk_Window tkwin); /* 51 */
- void *reserved52;
+ VOID *reserved52;
unsigned long (*tkpGetMS) (void); /* 53 */
#endif /* AQUA */
#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 8f776d8..b5d1a23 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -1277,7 +1277,7 @@ typedef struct TkIntXlibStubs {
Bool (*xFilterEvent) (XEvent *x, Window w); /* 78 */
int (*xmbLookupString) (XIC xi, XKeyPressedEvent *xk, char *c, int i, KeySym *k, Status *s); /* 79 */
void (*tkPutImage) (unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height); /* 80 */
- void *reserved81;
+ VOID *reserved81;
Status (*xParseColor) (Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr); /* 82 */
GC (*xCreateGC) (Display *display, Drawable d, unsigned long valuemask, XGCValues *values); /* 83 */
void (*xFreeGC) (Display *display, GC gc); /* 84 */