diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | generic/tk.decls | 554 | ||||
| -rw-r--r-- | generic/tkInt.decls | 308 | ||||
| -rw-r--r-- | generic/ttk/ttk.decls | 126 | ||||
| -rw-r--r-- | generic/ttk/ttkGenStubs.tcl | 151 |
5 files changed, 597 insertions, 549 deletions
@@ -1,3 +1,10 @@ +2010-09-14 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/ttk/ttkGenStubs.tcl: clean-up, port all genStubs.tcl changes + * generic/ttk/ttk.decls from Tcl to ttkGenStubs.tcl as well + * generic/tk.decls (no change in any output files) + * generic/tkInt.decls + 2010-09-16 Jeff Hobbs <jeffh@ActiveState.com> * win/tkWinX.c (_WIN32_IE): update to IE5.5 base expectation diff --git a/generic/tk.decls b/generic/tk.decls index 9e4a06a..415fead 100644 --- a/generic/tk.decls +++ b/generic/tk.decls @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tk.decls,v 1.53 2010/05/10 20:58:18 nijtmans Exp $ +# RCS: @(#) $Id: tk.decls,v 1.54 2010/09/20 21:18:22 nijtmans Exp $ library tk @@ -27,886 +27,886 @@ hooks {tkPlat tkInt tkIntPlat tkIntXlib} # the an index should never be reused for a different function in order # to preserve backwards compatibility. -declare 0 generic { +declare 0 { void Tk_MainLoop(void) } -declare 1 generic { +declare 1 { XColor *Tk_3DBorderColor(Tk_3DBorder border) } -declare 2 generic { +declare 2 { GC Tk_3DBorderGC(Tk_Window tkwin, Tk_3DBorder border, int which) } -declare 3 generic { +declare 3 { void Tk_3DHorizontalBevel(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftIn, int rightIn, int topBevel, int relief) } -declare 4 generic { +declare 4 { void Tk_3DVerticalBevel(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftBevel, int relief) } -declare 5 generic { +declare 5 { void Tk_AddOption(Tk_Window tkwin, const char *name, const char *value, int priority) } -declare 6 generic { +declare 6 { void Tk_BindEvent(Tk_BindingTable bindingTable, XEvent *eventPtr, Tk_Window tkwin, int numObjects, ClientData *objectPtr) } -declare 7 generic { +declare 7 { void Tk_CanvasDrawableCoords(Tk_Canvas canvas, double x, double y, short *drawableXPtr, short *drawableYPtr) } -declare 8 generic { +declare 8 { void Tk_CanvasEventuallyRedraw(Tk_Canvas canvas, int x1, int y1, int x2, int y2) } -declare 9 generic { +declare 9 { int Tk_CanvasGetCoord(Tcl_Interp *interp, Tk_Canvas canvas, const char *str, double *doublePtr) } -declare 10 generic { +declare 10 { Tk_CanvasTextInfo *Tk_CanvasGetTextInfo(Tk_Canvas canvas) } -declare 11 generic { +declare 11 { int Tk_CanvasPsBitmap(Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap, int x, int y, int width, int height) } -declare 12 generic { +declare 12 { int Tk_CanvasPsColor(Tcl_Interp *interp, Tk_Canvas canvas, XColor *colorPtr) } -declare 13 generic { +declare 13 { int Tk_CanvasPsFont(Tcl_Interp *interp, Tk_Canvas canvas, Tk_Font font) } -declare 14 generic { +declare 14 { void Tk_CanvasPsPath(Tcl_Interp *interp, Tk_Canvas canvas, double *coordPtr, int numPoints) } -declare 15 generic { +declare 15 { int Tk_CanvasPsStipple(Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap) } -declare 16 generic { +declare 16 { double Tk_CanvasPsY(Tk_Canvas canvas, double y) } -declare 17 generic { +declare 17 { void Tk_CanvasSetStippleOrigin(Tk_Canvas canvas, GC gc) } -declare 18 generic { +declare 18 { int Tk_CanvasTagsParseProc(ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset) } -declare 19 generic { +declare 19 { CONST86 char *Tk_CanvasTagsPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) } -declare 20 generic { +declare 20 { Tk_Window Tk_CanvasTkwin(Tk_Canvas canvas) } -declare 21 generic { +declare 21 { void Tk_CanvasWindowCoords(Tk_Canvas canvas, double x, double y, short *screenXPtr, short *screenYPtr) } -declare 22 generic { +declare 22 { void Tk_ChangeWindowAttributes(Tk_Window tkwin, unsigned long valueMask, XSetWindowAttributes *attsPtr) } -declare 23 generic { +declare 23 { int Tk_CharBbox(Tk_TextLayout layout, int index, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr) } -declare 24 generic { +declare 24 { void Tk_ClearSelection(Tk_Window tkwin, Atom selection) } -declare 25 generic { +declare 25 { int Tk_ClipboardAppend(Tcl_Interp *interp, Tk_Window tkwin, Atom target, Atom format, const char *buffer) } -declare 26 generic { +declare 26 { int Tk_ClipboardClear(Tcl_Interp *interp, Tk_Window tkwin) } -declare 27 generic { +declare 27 { int Tk_ConfigureInfo(Tcl_Interp *interp, Tk_Window tkwin, const Tk_ConfigSpec *specs, char *widgRec, const char *argvName, int flags) } -declare 28 generic { +declare 28 { int Tk_ConfigureValue(Tcl_Interp *interp, Tk_Window tkwin, const Tk_ConfigSpec *specs, char *widgRec, const char *argvName, int flags) } -declare 29 generic { +declare 29 { int Tk_ConfigureWidget(Tcl_Interp *interp, Tk_Window tkwin, const Tk_ConfigSpec *specs, int argc, CONST84 char **argv, char *widgRec, int flags) } -declare 30 generic { +declare 30 { void Tk_ConfigureWindow(Tk_Window tkwin, unsigned int valueMask, XWindowChanges *valuePtr) } -declare 31 generic { +declare 31 { Tk_TextLayout Tk_ComputeTextLayout(Tk_Font font, const char *str, int numChars, int wrapLength, Tk_Justify justify, int flags, int *widthPtr, int *heightPtr) } -declare 32 generic { +declare 32 { Tk_Window Tk_CoordsToWindow(int rootX, int rootY, Tk_Window tkwin) } -declare 33 generic { +declare 33 { unsigned long Tk_CreateBinding(Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventStr, const char *script, int append) } -declare 34 generic { +declare 34 { Tk_BindingTable Tk_CreateBindingTable(Tcl_Interp *interp) } -declare 35 generic { +declare 35 { Tk_ErrorHandler Tk_CreateErrorHandler(Display *display, int errNum, int request, int minorCode, Tk_ErrorProc *errorProc, ClientData clientData) } -declare 36 generic { +declare 36 { void Tk_CreateEventHandler(Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData) } -declare 37 generic { +declare 37 { void Tk_CreateGenericHandler(Tk_GenericProc *proc, ClientData clientData) } -declare 38 generic { +declare 38 { void Tk_CreateImageType(const Tk_ImageType *typePtr) } -declare 39 generic { +declare 39 { void Tk_CreateItemType(Tk_ItemType *typePtr) } -declare 40 generic { +declare 40 { void Tk_CreatePhotoImageFormat(const Tk_PhotoImageFormat *formatPtr) } -declare 41 generic { +declare 41 { void Tk_CreateSelHandler(Tk_Window tkwin, Atom selection, Atom target, Tk_SelectionProc *proc, ClientData clientData, Atom format) } -declare 42 generic { +declare 42 { Tk_Window Tk_CreateWindow(Tcl_Interp *interp, Tk_Window parent, const char *name, const char *screenName) } -declare 43 generic { +declare 43 { Tk_Window Tk_CreateWindowFromPath(Tcl_Interp *interp, Tk_Window tkwin, const char *pathName, const char *screenName) } -declare 44 generic { +declare 44 { int Tk_OldDefineBitmap(Tcl_Interp *interp, const char *name, const char *source, int width, int height) } -declare 45 generic { +declare 45 { void Tk_DefineCursor(Tk_Window window, Tk_Cursor cursor) } -declare 46 generic { +declare 46 { void Tk_DeleteAllBindings(Tk_BindingTable bindingTable, ClientData object) } -declare 47 generic { +declare 47 { int Tk_DeleteBinding(Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventStr) } -declare 48 generic { +declare 48 { void Tk_DeleteBindingTable(Tk_BindingTable bindingTable) } -declare 49 generic { +declare 49 { void Tk_DeleteErrorHandler(Tk_ErrorHandler handler) } -declare 50 generic { +declare 50 { void Tk_DeleteEventHandler(Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData) } -declare 51 generic { +declare 51 { void Tk_DeleteGenericHandler(Tk_GenericProc *proc, ClientData clientData) } -declare 52 generic { +declare 52 { void Tk_DeleteImage(Tcl_Interp *interp, const char *name) } -declare 53 generic { +declare 53 { void Tk_DeleteSelHandler(Tk_Window tkwin, Atom selection, Atom target) } -declare 54 generic { +declare 54 { void Tk_DestroyWindow(Tk_Window tkwin) } -declare 55 generic { +declare 55 { CONST84_RETURN char *Tk_DisplayName(Tk_Window tkwin) } -declare 56 generic { +declare 56 { int Tk_DistanceToTextLayout(Tk_TextLayout layout, int x, int y) } -declare 57 generic { +declare 57 { void Tk_Draw3DPolygon(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief) } -declare 58 generic { +declare 58 { void Tk_Draw3DRectangle(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief) } -declare 59 generic { +declare 59 { void Tk_DrawChars(Display *display, Drawable drawable, GC gc, Tk_Font tkfont, const char *source, int numBytes, int x, int y) } -declare 60 generic { +declare 60 { void Tk_DrawFocusHighlight(Tk_Window tkwin, GC gc, int width, Drawable drawable) } -declare 61 generic { +declare 61 { void Tk_DrawTextLayout(Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int firstChar, int lastChar) } -declare 62 generic { +declare 62 { void Tk_Fill3DPolygon(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief) } -declare 63 generic { +declare 63 { void Tk_Fill3DRectangle(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief) } -declare 64 generic { +declare 64 { Tk_PhotoHandle Tk_FindPhoto(Tcl_Interp *interp, const char *imageName) } -declare 65 generic { +declare 65 { Font Tk_FontId(Tk_Font font) } -declare 66 generic { +declare 66 { void Tk_Free3DBorder(Tk_3DBorder border) } -declare 67 generic { +declare 67 { void Tk_FreeBitmap(Display *display, Pixmap bitmap) } -declare 68 generic { +declare 68 { void Tk_FreeColor(XColor *colorPtr) } -declare 69 generic { +declare 69 { void Tk_FreeColormap(Display *display, Colormap colormap) } -declare 70 generic { +declare 70 { void Tk_FreeCursor(Display *display, Tk_Cursor cursor) } -declare 71 generic { +declare 71 { void Tk_FreeFont(Tk_Font f) } -declare 72 generic { +declare 72 { void Tk_FreeGC(Display *display, GC gc) } -declare 73 generic { +declare 73 { void Tk_FreeImage(Tk_Image image) } -declare 74 generic { +declare 74 { void Tk_FreeOptions(const Tk_ConfigSpec *specs, char *widgRec, Display *display, int needFlags) } -declare 75 generic { +declare 75 { void Tk_FreePixmap(Display *display, Pixmap pixmap) } -declare 76 generic { +declare 76 { void Tk_FreeTextLayout(Tk_TextLayout textLayout) } -declare 77 generic { +declare 77 { void Tk_FreeXId(Display *display, XID xid) } -declare 78 generic { +declare 78 { GC Tk_GCForColor(XColor *colorPtr, Drawable drawable) } -declare 79 generic { +declare 79 { void Tk_GeometryRequest(Tk_Window tkwin, int reqWidth, int reqHeight) } -declare 80 generic { +declare 80 { Tk_3DBorder Tk_Get3DBorder(Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid colorName) } -declare 81 generic { +declare 81 { void Tk_GetAllBindings(Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object) } -declare 82 generic { +declare 82 { int Tk_GetAnchor(Tcl_Interp *interp, const char *str, Tk_Anchor *anchorPtr) } -declare 83 generic { +declare 83 { CONST84_RETURN char *Tk_GetAtomName(Tk_Window tkwin, Atom atom) } -declare 84 generic { +declare 84 { CONST84_RETURN char *Tk_GetBinding(Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventStr) } -declare 85 generic { +declare 85 { Pixmap Tk_GetBitmap(Tcl_Interp *interp, Tk_Window tkwin, const char *str) } -declare 86 generic { +declare 86 { Pixmap Tk_OldGetBitmapFromData(Tcl_Interp *interp, Tk_Window tkwin, const char *source, int width, int height) } -declare 87 generic { +declare 87 { int Tk_GetCapStyle(Tcl_Interp *interp, const char *str, int *capPtr) } -declare 88 generic { +declare 88 { XColor *Tk_GetColor(Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid name) } -declare 89 generic { +declare 89 { XColor *Tk_GetColorByValue(Tk_Window tkwin, XColor *colorPtr) } -declare 90 generic { +declare 90 { Colormap Tk_GetColormap(Tcl_Interp *interp, Tk_Window tkwin, const char *str) } -declare 91 generic { +declare 91 { Tk_Cursor Tk_GetCursor(Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid str) } -declare 92 generic { +declare 92 { Tk_Cursor Tk_GetCursorFromData(Tcl_Interp *interp, Tk_Window tkwin, const char *source, const char *mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg) } -declare 93 generic { +declare 93 { Tk_Font Tk_GetFont(Tcl_Interp *interp, Tk_Window tkwin, const char *str) } -declare 94 generic { +declare 94 { Tk_Font Tk_GetFontFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } -declare 95 generic { +declare 95 { void Tk_GetFontMetrics(Tk_Font font, Tk_FontMetrics *fmPtr) } -declare 96 generic { +declare 96 { GC Tk_GetGC(Tk_Window tkwin, unsigned long valueMask, XGCValues *valuePtr) } -declare 97 generic { +declare 97 { Tk_Image Tk_GetImage(Tcl_Interp *interp, Tk_Window tkwin, const char *name, Tk_ImageChangedProc *changeProc, ClientData clientData) } -declare 98 generic { +declare 98 { ClientData Tk_GetImageMasterData(Tcl_Interp *interp, const char *name, CONST86 Tk_ImageType **typePtrPtr) } -declare 99 generic { +declare 99 { Tk_ItemType *Tk_GetItemTypes(void) } -declare 100 generic { +declare 100 { int Tk_GetJoinStyle(Tcl_Interp *interp, const char *str, int *joinPtr) } -declare 101 generic { +declare 101 { int Tk_GetJustify(Tcl_Interp *interp, const char *str, Tk_Justify *justifyPtr) } -declare 102 generic { +declare 102 { int Tk_GetNumMainWindows(void) } -declare 103 generic { +declare 103 { Tk_Uid Tk_GetOption(Tk_Window tkwin, const char *name, const char *className) } -declare 104 generic { +declare 104 { int Tk_GetPixels(Tcl_Interp *interp, Tk_Window tkwin, const char *str, int *intPtr) } -declare 105 generic { +declare 105 { Pixmap Tk_GetPixmap(Display *display, Drawable d, int width, int height, int depth) } -declare 106 generic { +declare 106 { int Tk_GetRelief(Tcl_Interp *interp, const char *name, int *reliefPtr) } -declare 107 generic { +declare 107 { void Tk_GetRootCoords(Tk_Window tkwin, int *xPtr, int *yPtr) } -declare 108 generic { +declare 108 { int Tk_GetScrollInfo(Tcl_Interp *interp, int argc, CONST84 char **argv, double *dblPtr, int *intPtr) } -declare 109 generic { +declare 109 { int Tk_GetScreenMM(Tcl_Interp *interp, Tk_Window tkwin, const char *str, double *doublePtr) } -declare 110 generic { +declare 110 { int Tk_GetSelection(Tcl_Interp *interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc *proc, ClientData clientData) } -declare 111 generic { +declare 111 { Tk_Uid Tk_GetUid(const char *str) } -declare 112 generic { +declare 112 { Visual *Tk_GetVisual(Tcl_Interp *interp, Tk_Window tkwin, const char *str, int *depthPtr, Colormap *colormapPtr) } -declare 113 generic { +declare 113 { void Tk_GetVRootGeometry(Tk_Window tkwin, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr) } -declare 114 generic { +declare 114 { int Tk_Grab(Tcl_Interp *interp, Tk_Window tkwin, int grabGlobal) } -declare 115 generic { +declare 115 { void Tk_HandleEvent(XEvent *eventPtr) } -declare 116 generic { +declare 116 { Tk_Window Tk_IdToWindow(Display *display, Window window) } -declare 117 generic { +declare 117 { void Tk_ImageChanged(Tk_ImageMaster master, int x, int y, int width, int height, int imageWidth, int imageHeight) } -declare 118 generic { +declare 118 { int Tk_Init(Tcl_Interp *interp) } -declare 119 generic { +declare 119 { Atom Tk_InternAtom(Tk_Window tkwin, const char *name) } -declare 120 generic { +declare 120 { int Tk_IntersectTextLayout(Tk_TextLayout layout, int x, int y, int width, int height) } -declare 121 generic { +declare 121 { void Tk_MaintainGeometry(Tk_Window slave, Tk_Window master, int x, int y, int width, int height) } -declare 122 generic { +declare 122 { Tk_Window Tk_MainWindow(Tcl_Interp *interp) } -declare 123 generic { +declare 123 { void Tk_MakeWindowExist(Tk_Window tkwin) } -declare 124 generic { +declare 124 { void Tk_ManageGeometry(Tk_Window tkwin, const Tk_GeomMgr *mgrPtr, ClientData clientData) } -declare 125 generic { +declare 125 { void Tk_MapWindow(Tk_Window tkwin) } -declare 126 generic { +declare 126 { int Tk_MeasureChars(Tk_Font tkfont, const char *source, int numBytes, int maxPixels, int flags, int *lengthPtr) } -declare 127 generic { +declare 127 { void Tk_MoveResizeWindow(Tk_Window tkwin, int x, int y, int width, int height) } -declare 128 generic { +declare 128 { void Tk_MoveWindow(Tk_Window tkwin, int x, int y) } -declare 129 generic { +declare 129 { void Tk_MoveToplevelWindow(Tk_Window tkwin, int x, int y) } -declare 130 generic { +declare 130 { CONST84_RETURN char *Tk_NameOf3DBorder(Tk_3DBorder border) } -declare 131 generic { +declare 131 { CONST84_RETURN char *Tk_NameOfAnchor(Tk_Anchor anchor) } -declare 132 generic { +declare 132 { CONST84_RETURN char *Tk_NameOfBitmap(Display *display, Pixmap bitmap) } -declare 133 generic { +declare 133 { CONST84_RETURN char *Tk_NameOfCapStyle(int cap) } -declare 134 generic { +declare 134 { CONST84_RETURN char *Tk_NameOfColor(XColor *colorPtr) } -declare 135 generic { +declare 135 { CONST84_RETURN char *Tk_NameOfCursor(Display *display, Tk_Cursor cursor) } -declare 136 generic { +declare 136 { CONST84_RETURN char *Tk_NameOfFont(Tk_Font font) } -declare 137 generic { +declare 137 { CONST84_RETURN char *Tk_NameOfImage(Tk_ImageMaster imageMaster) } -declare 138 generic { +declare 138 { CONST84_RETURN char *Tk_NameOfJoinStyle(int join) } -declare 139 generic { +declare 139 { CONST84_RETURN char *Tk_NameOfJustify(Tk_Justify justify) } -declare 140 generic { +declare 140 { CONST84_RETURN char *Tk_NameOfRelief(int relief) } -declare 141 generic { +declare 141 { Tk_Window Tk_NameToWindow(Tcl_Interp *interp, const char *pathName, Tk_Window tkwin) } -declare 142 generic { +declare 142 { void Tk_OwnSelection(Tk_Window tkwin, Atom selection, Tk_LostSelProc *proc, ClientData clientData) } -declare 143 generic { +declare 143 { int Tk_ParseArgv(Tcl_Interp *interp, Tk_Window tkwin, int *argcPtr, CONST84 char **argv, const Tk_ArgvInfo *argTable, int flags) } -declare 144 generic { +declare 144 { void Tk_PhotoPutBlock_NoComposite(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height) } -declare 145 generic { +declare 145 { void Tk_PhotoPutZoomedBlock_NoComposite(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY) } -declare 146 generic { +declare 146 { int Tk_PhotoGetImage(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr) } -declare 147 generic { +declare 147 { void Tk_PhotoBlank(Tk_PhotoHandle handle) } -declare 148 generic { +declare 148 { void Tk_PhotoExpand_Panic(Tk_PhotoHandle handle, int width, int height ) } -declare 149 generic { +declare 149 { void Tk_PhotoGetSize(Tk_PhotoHandle handle, int *widthPtr, int *heightPtr) } -declare 150 generic { +declare 150 { void Tk_PhotoSetSize_Panic(Tk_PhotoHandle handle, int width, int height) } -declare 151 generic { +declare 151 { int Tk_PointToChar(Tk_TextLayout layout, int x, int y) } -declare 152 generic { +declare 152 { int Tk_PostscriptFontName(Tk_Font tkfont, Tcl_DString *dsPtr) } -declare 153 generic { +declare 153 { void Tk_PreserveColormap(Display *display, Colormap colormap) } -declare 154 generic { +declare 154 { void Tk_QueueWindowEvent(XEvent *eventPtr, Tcl_QueuePosition position) } -declare 155 generic { +declare 155 { void Tk_RedrawImage(Tk_Image image, int imageX, int imageY, int width, int height, Drawable drawable, int drawableX, int drawableY) } -declare 156 generic { +declare 156 { void Tk_ResizeWindow(Tk_Window tkwin, int width, int height) } -declare 157 generic { +declare 157 { int Tk_RestackWindow(Tk_Window tkwin, int aboveBelow, Tk_Window other) } -declare 158 generic { +declare 158 { Tk_RestrictProc *Tk_RestrictEvents(Tk_RestrictProc *proc, ClientData arg, ClientData *prevArgPtr) } -declare 159 generic { +declare 159 { int Tk_SafeInit(Tcl_Interp *interp) } -declare 160 generic { +declare 160 { const char *Tk_SetAppName(Tk_Window tkwin, const char *name) } -declare 161 generic { +declare 161 { void Tk_SetBackgroundFromBorder(Tk_Window tkwin, Tk_3DBorder border) } -declare 162 generic { +declare 162 { void Tk_SetClass(Tk_Window tkwin, const char *className) } -declare 163 generic { +declare 163 { void Tk_SetGrid(Tk_Window tkwin, int reqWidth, int reqHeight, int gridWidth, int gridHeight) } -declare 164 generic { +declare 164 { void Tk_SetInternalBorder(Tk_Window tkwin, int width) } -declare 165 generic { +declare 165 { void Tk_SetWindowBackground(Tk_Window tkwin, unsigned long pixel) } -declare 166 generic { +declare 166 { void Tk_SetWindowBackgroundPixmap(Tk_Window tkwin, Pixmap pixmap) } -declare 167 generic { +declare 167 { void Tk_SetWindowBorder(Tk_Window tkwin, unsigned long pixel) } -declare 168 generic { +declare 168 { void Tk_SetWindowBorderWidth(Tk_Window tkwin, int width) } -declare 169 generic { +declare 169 { void Tk_SetWindowBorderPixmap(Tk_Window tkwin, Pixmap pixmap) } -declare 170 generic { +declare 170 { void Tk_SetWindowColormap(Tk_Window tkwin, Colormap colormap) } -declare 171 generic { +declare 171 { int Tk_SetWindowVisual(Tk_Window tkwin, Visual *visual, int depth, Colormap colormap) } -declare 172 generic { +declare 172 { void Tk_SizeOfBitmap(Display *display, Pixmap bitmap, int *widthPtr, int *heightPtr) } -declare 173 generic { +declare 173 { void Tk_SizeOfImage(Tk_Image image, int *widthPtr, int *heightPtr) } -declare 174 generic { +declare 174 { int Tk_StrictMotif(Tk_Window tkwin) } -declare 175 generic { +declare 175 { void Tk_TextLayoutToPostscript(Tcl_Interp *interp, Tk_TextLayout layout) } -declare 176 generic { +declare 176 { int Tk_TextWidth(Tk_Font font, const char *str, int numBytes) } -declare 177 generic { +declare 177 { void Tk_UndefineCursor(Tk_Window window) } -declare 178 generic { +declare 178 { void Tk_UnderlineChars(Display *display, Drawable drawable, GC gc, Tk_Font tkfont, const char *source, int x, int y, int firstByte, int lastByte) } -declare 179 generic { +declare 179 { void Tk_UnderlineTextLayout(Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int underline) } -declare 180 generic { +declare 180 { void Tk_Ungrab(Tk_Window tkwin) } -declare 181 generic { +declare 181 { void Tk_UnmaintainGeometry(Tk_Window slave, Tk_Window master) } -declare 182 generic { +declare 182 { void Tk_UnmapWindow(Tk_Window tkwin) } -declare 183 generic { +declare 183 { void Tk_UnsetGrid(Tk_Window tkwin) } -declare 184 generic { +declare 184 { void Tk_UpdatePointer(Tk_Window tkwin, int x, int y, int state) } # new functions for 8.1 -declare 185 generic { +declare 185 { Pixmap Tk_AllocBitmapFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr) } -declare 186 generic { +declare 186 { Tk_3DBorder Tk_Alloc3DBorderFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr) } -declare 187 generic { +declare 187 { XColor *Tk_AllocColorFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr) } -declare 188 generic { +declare 188 { Tk_Cursor Tk_AllocCursorFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr) } -declare 189 generic { +declare 189 { Tk_Font Tk_AllocFontFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr) } -declare 190 generic { +declare 190 { Tk_OptionTable Tk_CreateOptionTable(Tcl_Interp *interp, const Tk_OptionSpec *templatePtr) } -declare 191 generic { +declare 191 { void Tk_DeleteOptionTable(Tk_OptionTable optionTable) } -declare 192 generic { +declare 192 { void Tk_Free3DBorderFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } -declare 193 generic { +declare 193 { void Tk_FreeBitmapFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } -declare 194 generic { +declare 194 { void Tk_FreeColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } -declare 195 generic { +declare 195 { void Tk_FreeConfigOptions(char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin) } -declare 196 generic { +declare 196 { void Tk_FreeSavedOptions(Tk_SavedOptions *savePtr) } -declare 197 generic { +declare 197 { void Tk_FreeCursorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } -declare 198 generic { +declare 198 { void Tk_FreeFontFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } -declare 199 generic { +declare 199 { Tk_3DBorder Tk_Get3DBorderFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } -declare 200 generic { +declare 200 { int Tk_GetAnchorFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, Tk_Anchor *anchorPtr) } -declare 201 generic { +declare 201 { Pixmap Tk_GetBitmapFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } -declare 202 generic { +declare 202 { XColor *Tk_GetColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } -declare 203 generic { +declare 203 { Tk_Cursor Tk_GetCursorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } -declare 204 generic { +declare 204 { Tcl_Obj *Tk_GetOptionInfo(Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin) } -declare 205 generic { +declare 205 { Tcl_Obj *Tk_GetOptionValue(Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin) } -declare 206 generic { +declare 206 { int Tk_GetJustifyFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, Tk_Justify *justifyPtr) } -declare 207 generic { +declare 207 { int Tk_GetMMFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, double *doublePtr) } -declare 208 generic { +declare 208 { int Tk_GetPixelsFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, int *intPtr) } -declare 209 generic { +declare 209 { int Tk_GetReliefFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr) } -declare 210 generic { +declare 210 { int Tk_GetScrollInfoObj(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], double *dblPtr, int *intPtr) } -declare 211 generic { +declare 211 { int Tk_InitOptions(Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin) } -declare 212 generic { +declare 212 { void Tk_MainEx(int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp) } -declare 213 generic { +declare 213 { void Tk_RestoreSavedOptions(Tk_SavedOptions *savePtr) } -declare 214 generic { +declare 214 { int Tk_SetOptions(Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *const objv[], Tk_Window tkwin, Tk_SavedOptions *savePtr, int *maskPtr) } -declare 215 generic { +declare 215 { void Tk_InitConsoleChannels(Tcl_Interp *interp) } -declare 216 generic { +declare 216 { int Tk_CreateConsoleWindow(Tcl_Interp *interp) } -declare 217 generic { +declare 217 { void Tk_CreateSmoothMethod(Tcl_Interp *interp, const Tk_SmoothMethod *method) } -#declare 218 generic { +#declare 218 { # void Tk_CreateCanvasVisitor(Tcl_Interp *interp, void *typePtr) #} -#declare 219 generic { +#declare 219 { # void *Tk_GetCanvasVisitor(Tcl_Interp *interp, const char *name) #} -declare 220 generic { +declare 220 { int Tk_GetDash(Tcl_Interp *interp, const char *value, Tk_Dash *dash) } -declare 221 generic { +declare 221 { void Tk_CreateOutline(Tk_Outline *outline) } -declare 222 generic { +declare 222 { void Tk_DeleteOutline(Display *display, Tk_Outline *outline) } -declare 223 generic { +declare 223 { int Tk_ConfigOutlineGC(XGCValues *gcValues, Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline) } -declare 224 generic { +declare 224 { int Tk_ChangeOutlineGC(Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline) } -declare 225 generic { +declare 225 { int Tk_ResetOutlineGC(Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline) } -declare 226 generic { +declare 226 { int Tk_CanvasPsOutline(Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline) } -declare 227 generic { +declare 227 { void Tk_SetTSOrigin(Tk_Window tkwin, GC gc, int x, int y) } -declare 228 generic { +declare 228 { int Tk_CanvasGetCoordFromObj(Tcl_Interp *interp, Tk_Canvas canvas, Tcl_Obj *obj, double *doublePtr) } -declare 229 generic { +declare 229 { void Tk_CanvasSetOffset(Tk_Canvas canvas, GC gc, Tk_TSOffset *offset) } -declare 230 generic { +declare 230 { void Tk_DitherPhoto(Tk_PhotoHandle handle, int x, int y, int width, int height) } -declare 231 generic { +declare 231 { int Tk_PostscriptBitmap(Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap, int startX, int startY, int width, int height) } -declare 232 generic { +declare 232 { int Tk_PostscriptColor(Tcl_Interp *interp, Tk_PostscriptInfo psInfo, XColor *colorPtr) } -declare 233 generic { +declare 233 { int Tk_PostscriptFont(Tcl_Interp *interp, Tk_PostscriptInfo psInfo, Tk_Font font) } -declare 234 generic { +declare 234 { int Tk_PostscriptImage(Tk_Image image, Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psinfo, int x, int y, int width, int height, int prepass) } -declare 235 generic { +declare 235 { void Tk_PostscriptPath(Tcl_Interp *interp, Tk_PostscriptInfo psInfo, double *coordPtr, int numPoints) } -declare 236 generic { +declare 236 { int Tk_PostscriptStipple(Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap) } -declare 237 generic { +declare 237 { double Tk_PostscriptY(double y, Tk_PostscriptInfo psInfo) } -declare 238 generic { +declare 238 { int Tk_PostscriptPhoto(Tcl_Interp *interp, Tk_PhotoImageBlock *blockPtr, Tk_PostscriptInfo psInfo, int width, int height) @@ -914,146 +914,146 @@ declare 238 generic { # New in 8.4a1 # -declare 239 generic { +declare 239 { void Tk_CreateClientMessageHandler(Tk_ClientMessageProc *proc) } -declare 240 generic { +declare 240 { void Tk_DeleteClientMessageHandler(Tk_ClientMessageProc *proc) } # New in 8.4a2 # -declare 241 generic { +declare 241 { Tk_Window Tk_CreateAnonymousWindow(Tcl_Interp *interp, Tk_Window parent, const char *screenName) } -declare 242 generic { +declare 242 { void Tk_SetClassProcs(Tk_Window tkwin, const Tk_ClassProcs *procs, ClientData instanceData) } # New in 8.4a4 # -declare 243 generic { +declare 243 { void Tk_SetInternalBorderEx(Tk_Window tkwin, int left, int right, int top, int bottom) } -declare 244 generic { +declare 244 { void Tk_SetMinimumRequestSize(Tk_Window tkwin, int minWidth, int minHeight) } # New in 8.4a5 # -declare 245 generic { +declare 245 { void Tk_SetCaretPos(Tk_Window tkwin, int x, int y, int height) } -declare 246 generic { +declare 246 { void Tk_PhotoPutBlock_Panic(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRule) } -declare 247 generic { +declare 247 { void Tk_PhotoPutZoomedBlock_Panic(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule) } -declare 248 generic { +declare 248 { int Tk_CollapseMotionEvents(Display *display, int collapse) } # Style engine -declare 249 generic { +declare 249 { Tk_StyleEngine Tk_RegisterStyleEngine(const char *name, Tk_StyleEngine parent) } -declare 250 generic { +declare 250 { Tk_StyleEngine Tk_GetStyleEngine(const char *name) } -declare 251 generic { +declare 251 { int Tk_RegisterStyledElement(Tk_StyleEngine engine, Tk_ElementSpec *templatePtr) } -declare 252 generic { +declare 252 { int Tk_GetElementId(const char *name) } -declare 253 generic { +declare 253 { Tk_Style Tk_CreateStyle(const char *name, Tk_StyleEngine engine, ClientData clientData) } -declare 254 generic { +declare 254 { Tk_Style Tk_GetStyle(Tcl_Interp *interp, const char *name) } -declare 255 generic { +declare 255 { void Tk_FreeStyle(Tk_Style style) } -declare 256 generic { +declare 256 { const char *Tk_NameOfStyle(Tk_Style style) } -declare 257 generic { +declare 257 { Tk_Style Tk_AllocStyleFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr) } -declare 258 generic { +declare 258 { Tk_Style Tk_GetStyleFromObj(Tcl_Obj *objPtr) } -declare 259 generic { +declare 259 { void Tk_FreeStyleFromObj(Tcl_Obj *objPtr) } -declare 260 generic { +declare 260 { Tk_StyledElement Tk_GetStyledElement(Tk_Style style, int elementId, Tk_OptionTable optionTable) } -declare 261 generic { +declare 261 { void Tk_GetElementSize(Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, int width, int height, int inner, int *widthPtr, int *heightPtr) } -declare 262 generic { +declare 262 { void Tk_GetElementBox(Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, int x, int y, int width, int height, int inner, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr) } -declare 263 generic { +declare 263 { int Tk_GetElementBorderWidth(Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin) } -declare 264 generic { +declare 264 { void Tk_DrawElement(Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, Drawable d, int x, int y, int width, int height, int state) } # TIP#116 -declare 265 generic { +declare 265 { int Tk_PhotoExpand(Tcl_Interp *interp, Tk_PhotoHandle handle, int width, int height) } -declare 266 generic { +declare 266 { int Tk_PhotoPutBlock(Tcl_Interp *interp, Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRule) } -declare 267 generic { +declare 267 { 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) } -declare 268 generic { +declare 268 { int Tk_PhotoSetSize(Tcl_Interp *interp, Tk_PhotoHandle handle, int width, int height) } # TIP#245 -declare 269 generic { +declare 269 { long Tk_GetUserInactiveTime(Display *dpy) } -declare 270 generic { +declare 270 { void Tk_ResetUserInactiveTime(Display *dpy) } # TIP #264 -declare 271 generic { +declare 271 { Tcl_Interp *Tk_Interp(Tk_Window tkwin) } @@ -1067,20 +1067,20 @@ declare 271 generic { # It will *not* be [load]able into interps with Tk 8.4 (or Tk 8.2!). # Developers who need to produce a file [load]able into legacy interps must # build against legacy sources. -declare 272 generic { +declare 272 { void Tk_CreateOldImageType(const Tk_ImageType *typePtr) } -declare 273 generic { +declare 273 { void Tk_CreateOldPhotoImageFormat(const Tk_PhotoImageFormat *formatPtr) } # See [Enhancement request 2636558] Tk_DefineBitmap and # Tk_GetBitmapFromData signature problem -declare 274 generic { +declare 274 { int Tk_DefineBitmap(Tcl_Interp *interp, const char *name, const void *source, int width, int height) } -declare 275 generic { +declare 275 { Pixmap Tk_GetBitmapFromData(Tcl_Interp *interp, Tk_Window tkwin, const void *source, int width, int height) } diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 2bf8831..7f7d34e 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -10,7 +10,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tkInt.decls,v 1.63 2010/06/21 12:14:08 nijtmans Exp $ +# RCS: @(#) $Id: tkInt.decls,v 1.64 2010/09/20 21:18:22 nijtmans Exp $ library tk @@ -25,36 +25,36 @@ interface tkInt # risk. Note that the position of functions should not be changed between # versions to avoid gratuitous incompatibilities. -declare 0 generic { +declare 0 { TkWindow *TkAllocWindow(TkDisplay *dispPtr, int screenNum, TkWindow *parentPtr) } -declare 1 generic { +declare 1 { void TkBezierPoints(double control[], int numSteps, double *coordPtr) } -declare 2 generic { +declare 2 { void TkBezierScreenPoints(Tk_Canvas canvas, double control[], int numSteps, XPoint *xPointPtr) } # # Slot 3 unused (WAS: TkBindDeadWindow) # -declare 4 generic { +declare 4 { void TkBindEventProc(TkWindow *winPtr, XEvent *eventPtr) } -declare 5 generic { +declare 5 { void TkBindFree(TkMainInfo *mainPtr) } -declare 6 generic { +declare 6 { void TkBindInit(TkMainInfo *mainPtr) } -declare 7 generic { +declare 7 { void TkChangeEventWindow(XEvent *eventPtr, TkWindow *winPtr) } -declare 8 generic { +declare 8 { int TkClipInit(Tcl_Interp *interp, TkDisplay *dispPtr) } -declare 9 generic { +declare 9 { void TkComputeAnchor(Tk_Anchor anchor, Tk_Window tkwin, int padX, int padY, int innerWidth, int innerHeight, int *xPtr, int *yPtr) } @@ -62,342 +62,342 @@ declare 9 generic { # Slot 10 unused (WAS: TkCopyAndGlobalEval) # Slot 11 unused (WAS: TkCreateBindingProcedure) # -declare 12 generic { +declare 12 { TkCursor *TkCreateCursorFromData(Tk_Window tkwin, const char *source, const char *mask, int width, int height, int xHot, int yHot, XColor fg, XColor bg) } -declare 13 generic { +declare 13 { int TkCreateFrame(ClientData clientData, Tcl_Interp *interp, int argc, const char *const *argv, int toplevel, const char *appName) } -declare 14 generic { +declare 14 { Tk_Window TkCreateMainWindow(Tcl_Interp *interp, const char *screenName, const char *baseName) } -declare 15 generic { +declare 15 { Time TkCurrentTime(TkDisplay *dispPtr) } -declare 16 generic { +declare 16 { void TkDeleteAllImages(TkMainInfo *mainPtr) } -declare 17 generic { +declare 17 { void TkDoConfigureNotify(TkWindow *winPtr) } -declare 18 generic { +declare 18 { void TkDrawInsetFocusHighlight(Tk_Window tkwin, GC gc, int width, Drawable drawable, int padding) } -declare 19 generic { +declare 19 { void TkEventDeadWindow(TkWindow *winPtr) } -declare 20 generic { +declare 20 { void TkFillPolygon(Tk_Canvas canvas, double *coordPtr, int numPoints, Display *display, Drawable drawable, GC gc, GC outlineGC) } -declare 21 generic { +declare 21 { int TkFindStateNum(Tcl_Interp *interp, const char *option, const TkStateMap *mapPtr, const char *strKey) } -declare 22 generic { +declare 22 { CONST86 char *TkFindStateString(const TkStateMap *mapPtr, int numKey) } -declare 23 generic { +declare 23 { void TkFocusDeadWindow(TkWindow *winPtr) } -declare 24 generic { +declare 24 { int TkFocusFilterEvent(TkWindow *winPtr, XEvent *eventPtr) } -declare 25 generic { +declare 25 { TkWindow *TkFocusKeyEvent(TkWindow *winPtr, XEvent *eventPtr) } -declare 26 generic { +declare 26 { void TkFontPkgInit(TkMainInfo *mainPtr) } -declare 27 generic { +declare 27 { void TkFontPkgFree(TkMainInfo *mainPtr) } -declare 28 generic { +declare 28 { void TkFreeBindingTags(TkWindow *winPtr) } # Name change only, TkFreeCursor in Tcl 8.0.x now TkpFreeCursor -declare 29 generic { +declare 29 { void TkpFreeCursor(TkCursor *cursorPtr) } -declare 30 generic { +declare 30 { char *TkGetBitmapData(Tcl_Interp *interp, const char *string, const char *fileName, int *widthPtr, int *heightPtr, int *hotXPtr, int *hotYPtr) } -declare 31 generic { +declare 31 { void TkGetButtPoints(double p1[], double p2[], double width, int project, double m1[], double m2[]) } -declare 32 generic { +declare 32 { TkCursor *TkGetCursorByName(Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid string) } -declare 33 generic { +declare 33 { const char *TkGetDefaultScreenName(Tcl_Interp *interp, const char *screenName) } -declare 34 generic { +declare 34 { TkDisplay *TkGetDisplay(Display *display) } -declare 35 generic { +declare 35 { int TkGetDisplayOf(Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Tk_Window *tkwinPtr) } -declare 36 generic { +declare 36 { TkWindow *TkGetFocusWin(TkWindow *winPtr) } -declare 37 generic { +declare 37 { int TkGetInterpNames(Tcl_Interp *interp, Tk_Window tkwin) } -declare 38 generic { +declare 38 { int TkGetMiterPoints(double p1[], double p2[], double p3[], double width, double m1[], double m2[]) } -declare 39 generic { +declare 39 { void TkGetPointerCoords(Tk_Window tkwin, int *xPtr, int *yPtr) } -declare 40 generic { +declare 40 { void TkGetServerInfo(Tcl_Interp *interp, Tk_Window tkwin) } -declare 41 generic { +declare 41 { void TkGrabDeadWindow(TkWindow *winPtr) } -declare 42 generic { +declare 42 { int TkGrabState(TkWindow *winPtr) } -declare 43 generic { +declare 43 { void TkIncludePoint(Tk_Item *itemPtr, double *pointPtr) } -declare 44 generic { +declare 44 { void TkInOutEvents(XEvent *eventPtr, TkWindow *sourcePtr, TkWindow *destPtr, int leaveType, int enterType, Tcl_QueuePosition position) } -declare 45 generic { +declare 45 { void TkInstallFrameMenu(Tk_Window tkwin) } -declare 46 generic { +declare 46 { CONST86 char *TkKeysymToString(KeySym keysym) } -declare 47 generic { +declare 47 { int TkLineToArea(double end1Ptr[], double end2Ptr[], double rectPtr[]) } -declare 48 generic { +declare 48 { double TkLineToPoint(double end1Ptr[], double end2Ptr[], double pointPtr[]) } -declare 49 generic { +declare 49 { int TkMakeBezierCurve(Tk_Canvas canvas, double *pointPtr, int numPoints, int numSteps, XPoint xPoints[], double dblPoints[]) } -declare 50 generic { +declare 50 { void TkMakeBezierPostscript(Tcl_Interp *interp, Tk_Canvas canvas, double *pointPtr, int numPoints) } -declare 51 generic { +declare 51 { void TkOptionClassChanged(TkWindow *winPtr) } -declare 52 generic { +declare 52 { void TkOptionDeadWindow(TkWindow *winPtr) } -declare 53 generic { +declare 53 { int TkOvalToArea(double *ovalPtr, double *rectPtr) } -declare 54 generic { +declare 54 { double TkOvalToPoint(double ovalPtr[], double width, int filled, double pointPtr[]) } -declare 55 generic { +declare 55 { int TkpChangeFocus(TkWindow *winPtr, int force) } -declare 56 generic { +declare 56 { void TkpCloseDisplay(TkDisplay *dispPtr) } -declare 57 generic { +declare 57 { void TkpClaimFocus(TkWindow *topLevelPtr, int force) } -declare 58 generic { +declare 58 { void TkpDisplayWarning(const char *msg, const char *title) } -declare 59 generic { +declare 59 { void TkpGetAppName(Tcl_Interp *interp, Tcl_DString *name) } -declare 60 generic { +declare 60 { TkWindow *TkpGetOtherWindow(TkWindow *winPtr) } -declare 61 generic { +declare 61 { TkWindow *TkpGetWrapperWindow(TkWindow *winPtr) } -declare 62 generic { +declare 62 { int TkpInit(Tcl_Interp *interp) } -declare 63 generic { +declare 63 { void TkpInitializeMenuBindings(Tcl_Interp *interp, Tk_BindingTable bindingTable) } -declare 64 generic { +declare 64 { void TkpMakeContainer(Tk_Window tkwin) } -declare 65 generic { +declare 65 { void TkpMakeMenuWindow(Tk_Window tkwin, int transient) } -declare 66 generic { +declare 66 { Window TkpMakeWindow(TkWindow *winPtr, Window parent) } -declare 67 generic { +declare 67 { void TkpMenuNotifyToplevelCreate(Tcl_Interp *interp, const char *menuName) } -declare 68 generic { +declare 68 { TkDisplay *TkpOpenDisplay(const char *display_name) } -declare 69 generic { +declare 69 { int TkPointerEvent(XEvent *eventPtr, TkWindow *winPtr) } -declare 70 generic { +declare 70 { int TkPolygonToArea(double *polyPtr, int numPoints, double *rectPtr) } -declare 71 generic { +declare 71 { double TkPolygonToPoint(double *polyPtr, int numPoints, double *pointPtr) } -declare 72 generic { +declare 72 { int TkPositionInTree(TkWindow *winPtr, TkWindow *treePtr) } -declare 73 generic { +declare 73 { void TkpRedirectKeyEvent(TkWindow *winPtr, XEvent *eventPtr) } -declare 74 generic { +declare 74 { void TkpSetMainMenubar(Tcl_Interp *interp, Tk_Window tkwin, const char *menuName) } -declare 75 generic { +declare 75 { int TkpUseWindow(Tcl_Interp *interp, Tk_Window tkwin, const char *string) } -declare 77 generic { +declare 77 { void TkQueueEventForAllChildren(TkWindow *winPtr, XEvent *eventPtr) } -declare 78 generic { +declare 78 { int TkReadBitmapFile(Display *display, Drawable d, const char *filename, unsigned int *width_return, unsigned int *height_return, Pixmap *bitmap_return, int *x_hot_return, int *y_hot_return) } -declare 79 generic { +declare 79 { int TkScrollWindow(Tk_Window tkwin, GC gc, int x, int y, int width, int height, int dx, int dy, TkRegion damageRgn) } -declare 80 generic { +declare 80 { void TkSelDeadWindow(TkWindow *winPtr) } -declare 81 generic { +declare 81 { void TkSelEventProc(Tk_Window tkwin, XEvent *eventPtr) } -declare 82 generic { +declare 82 { void TkSelInit(Tk_Window tkwin) } -declare 83 generic { +declare 83 { void TkSelPropProc(XEvent *eventPtr) } # Exported publically as Tk_SetClassProcs in 8.4a2 -#declare 84 generic { +#declare 84 { # void TkSetClassProcs(Tk_Window tkwin, # TkClassProcs *procs, ClientData instanceData) #} -declare 85 generic { +declare 85 { void TkSetWindowMenuBar(Tcl_Interp *interp, Tk_Window tkwin, const char *oldMenuName, const char *menuName) } -declare 86 generic { +declare 86 { KeySym TkStringToKeysym(const char *name) } -declare 87 generic { +declare 87 { int TkThickPolyLineToArea(double *coordPtr, int numPoints, double width, int capStyle, int joinStyle, double *rectPtr) } -declare 88 generic { +declare 88 { void TkWmAddToColormapWindows(TkWindow *winPtr) } -declare 89 generic { +declare 89 { void TkWmDeadWindow(TkWindow *winPtr) } -declare 90 generic { +declare 90 { TkWindow *TkWmFocusToplevel(TkWindow *winPtr) } -declare 91 generic { +declare 91 { void TkWmMapWindow(TkWindow *winPtr) } -declare 92 generic { +declare 92 { void TkWmNewWindow(TkWindow *winPtr) } -declare 93 generic { +declare 93 { void TkWmProtocolEventProc(TkWindow *winPtr, XEvent *evenvPtr) } -declare 94 generic { +declare 94 { void TkWmRemoveFromColormapWindows(TkWindow *winPtr) } -declare 95 generic { +declare 95 { void TkWmRestackToplevel(TkWindow *winPtr, int aboveBelow, TkWindow *otherPtr) } -declare 96 generic { +declare 96 { void TkWmSetClass(TkWindow *winPtr) } -declare 97 generic { +declare 97 { void TkWmUnmapWindow(TkWindow *winPtr) } # new for 8.1 -declare 98 generic { +declare 98 { Tcl_Obj *TkDebugBitmap(Tk_Window tkwin, const char *name) } -declare 99 generic { +declare 99 { Tcl_Obj *TkDebugBorder(Tk_Window tkwin, const char *name) } -declare 100 generic { +declare 100 { Tcl_Obj *TkDebugCursor(Tk_Window tkwin, const char *name) } -declare 101 generic { +declare 101 { Tcl_Obj *TkDebugColor(Tk_Window tkwin, const char *name) } -declare 102 generic { +declare 102 { Tcl_Obj *TkDebugConfig(Tcl_Interp *interp, Tk_OptionTable table) } -declare 103 generic { +declare 103 { Tcl_Obj *TkDebugFont(Tk_Window tkwin, const char *name) } -declare 104 generic { +declare 104 { int TkFindStateNumObj(Tcl_Interp *interp, Tcl_Obj *optionPtr, const TkStateMap *mapPtr, Tcl_Obj *keyPtr) } -declare 105 generic { +declare 105 { Tcl_HashTable *TkGetBitmapPredefTable(void) } -declare 106 generic { +declare 106 { TkDisplay *TkGetDisplayList(void) } -declare 107 generic { +declare 107 { TkMainInfo *TkGetMainInfoList(void) } -declare 108 generic { +declare 108 { int TkGetWindowFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, Tk_Window *windowPtr) } -declare 109 generic { +declare 109 { CONST86 char *TkpGetString(TkWindow *winPtr, XEvent *eventPtr, Tcl_DString *dsPtr) } -declare 110 generic { +declare 110 { void TkpGetSubFonts(Tcl_Interp *interp, Tk_Font tkfont) } -declare 111 generic { +declare 111 { Tcl_Obj *TkpGetSystemDefault(Tk_Window tkwin, const char *dbName, const char *className) } -declare 112 generic { +declare 112 { void TkpMenuThreadInit(void) } declare 113 {aqua win} { @@ -433,182 +433,182 @@ declare 124 aqua { Pixmap TkpGetNativeAppBitmap(Display *display, const char *name, int *width, int *height) } -declare 135 generic { +declare 135 { void TkpDrawHighlightBorder(Tk_Window tkwin, GC fgGC, GC bgGC, int highlightWidth, Drawable drawable) } -declare 136 generic { +declare 136 { void TkSetFocusWin(TkWindow *winPtr, int force) } -declare 137 generic { +declare 137 { void TkpSetKeycodeAndState(Tk_Window tkwin, KeySym keySym, XEvent *eventPtr) } -declare 138 generic { +declare 138 { KeySym TkpGetKeySym(TkDisplay *dispPtr, XEvent *eventPtr) } -declare 139 generic { +declare 139 { void TkpInitKeymapInfo(TkDisplay *dispPtr) } -declare 140 generic { +declare 140 { TkRegion TkPhotoGetValidRegion(Tk_PhotoHandle handle) } -declare 141 generic { +declare 141 { TkWindow **TkWmStackorderToplevel(TkWindow *parentPtr) } -declare 142 generic { +declare 142 { void TkFocusFree(TkMainInfo *mainPtr) } -declare 143 generic { +declare 143 { void TkClipCleanup(TkDisplay *dispPtr) } -declare 144 generic { +declare 144 { void TkGCCleanup(TkDisplay *dispPtr) } declare 145 {win aqua} { void TkSubtractRegion(TkRegion sra, TkRegion srcb, TkRegion dr_return) } -declare 146 generic { +declare 146 { void TkStylePkgInit(TkMainInfo *mainPtr) } -declare 147 generic { +declare 147 { void TkStylePkgFree(TkMainInfo *mainPtr) } -declare 148 generic { +declare 148 { Tk_Window TkToplevelWindowForCommand(Tcl_Interp *interp, const char *cmdName) } -declare 149 generic { +declare 149 { const Tk_OptionSpec *TkGetOptionSpec(const char *name, Tk_OptionTable optionTable) } # TIP#168 -declare 150 generic { +declare 150 { int TkMakeRawCurve(Tk_Canvas canvas, double *pointPtr, int numPoints, int numSteps, XPoint xPoints[], double dblPoints[]) } -declare 151 generic { +declare 151 { void TkMakeRawCurvePostscript(Tcl_Interp *interp, Tk_Canvas canvas, double *pointPtr, int numPoints) } -declare 152 generic { +declare 152 { void TkpDrawFrame(Tk_Window tkwin, Tk_3DBorder border, int highlightWidth, int borderWidth, int relief) } -declare 153 generic { +declare 153 { void TkCreateThreadExitHandler(Tcl_ExitProc *proc, ClientData clientData) } -declare 154 generic { +declare 154 { void TkDeleteThreadExitHandler(Tcl_ExitProc *proc, ClientData clientData) } # entries needed only by tktest: -declare 156 generic { +declare 156 { int TkpTestembedCmd(ClientData clientData, Tcl_Interp *interp, int argc, const char **argv) } -declare 157 generic { +declare 157 { int TkpTesttextCmd(ClientData dummy, Tcl_Interp *interp, int argc, const char **argv) } -declare 158 generic { +declare 158 { int TkSelGetSelection(Tcl_Interp *interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc *proc, ClientData clientData) } -declare 159 generic { +declare 159 { int TkTextGetIndex(Tcl_Interp *interp, struct TkText *textPtr, const char *string, struct TkTextIndex *indexPtr) } -declare 160 generic { +declare 160 { int TkTextIndexBackBytes(const struct TkText *textPtr, const struct TkTextIndex *srcPtr, int count, struct TkTextIndex *dstPtr) } -declare 161 generic { +declare 161 { int TkTextIndexForwBytes(const struct TkText *textPtr, const struct TkTextIndex *srcPtr, int count, struct TkTextIndex *dstPtr) } -declare 162 generic { +declare 162 { struct TkTextIndex *TkTextMakeByteIndex(TkTextBTree tree, const struct TkText *textPtr, int lineIndex, int byteIndex, struct TkTextIndex *indexPtr) } -declare 163 generic { +declare 163 { int TkTextPrintIndex(const struct TkText *textPtr, const struct TkTextIndex *indexPtr, char *string) } -declare 164 generic { +declare 164 { struct TkTextSegment *TkTextSetMark(struct TkText *textPtr, const char *name, struct TkTextIndex *indexPtr) } -declare 165 generic { +declare 165 { int TkTextXviewCmd(struct TkText *textPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) } -declare 166 generic { +declare 166 { void TkTextChanged(struct TkSharedText *sharedTextPtr, struct TkText *textPtr, const struct TkTextIndex *index1Ptr, const struct TkTextIndex *index2Ptr) } -declare 167 generic { +declare 167 { int TkBTreeNumLines(TkTextBTree tree, const struct TkText *textPtr) } -declare 168 generic { +declare 168 { void TkTextInsertDisplayProc(struct TkText *textPtr, struct TkTextDispChunk *chunkPtr, int x, int y, int height, int baseline, Display *display, Drawable dst, int screenY) } # Next group of functions exposed due to [Bug 2768945]. -declare 169 generic { +declare 169 { int TkStateParseProc(ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset) } -declare 170 generic { +declare 170 { CONST86 char *TkStatePrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) } -declare 171 generic { +declare 171 { int TkCanvasDashParseProc(ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset) } -declare 172 generic { +declare 172 { CONST86 char *TkCanvasDashPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) } -declare 173 generic { +declare 173 { int TkOffsetParseProc(ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset) } -declare 174 generic { +declare 174 { CONST86 char *TkOffsetPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) } -declare 175 generic { +declare 175 { int TkPixelParseProc(ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset) } -declare 176 generic { +declare 176 { CONST86 char *TkPixelPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) } -declare 177 generic { +declare 177 { int TkOrientParseProc(ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset) } -declare 178 generic { +declare 178 { CONST86 char *TkOrientPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) } -declare 179 generic { +declare 179 { int TkSmoothParseProc(ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset) } -declare 180 generic { +declare 180 { CONST86 char *TkSmoothPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) } diff --git a/generic/ttk/ttk.decls b/generic/ttk/ttk.decls index d18d5a8..4567135 100644 --- a/generic/ttk/ttk.decls +++ b/generic/ttk/ttk.decls @@ -1,5 +1,5 @@ # -# $Id: ttk.decls,v 1.5 2010/02/05 17:42:21 nijtmans Exp $ +# $Id: ttk.decls,v 1.6 2010/09/20 21:18:23 nijtmans Exp $ # library ttk @@ -7,148 +7,148 @@ interface ttk epoch 0 scspec TTKAPI -declare 0 current { - Ttk_Theme Ttk_GetTheme(Tcl_Interp *interp, const char *name); +declare 0 { + Ttk_Theme Ttk_GetTheme(Tcl_Interp *interp, const char *name) } -declare 1 current { - Ttk_Theme Ttk_GetDefaultTheme(Tcl_Interp *interp); +declare 1 { + Ttk_Theme Ttk_GetDefaultTheme(Tcl_Interp *interp) } -declare 2 current { - Ttk_Theme Ttk_GetCurrentTheme(Tcl_Interp *interp); +declare 2 { + Ttk_Theme Ttk_GetCurrentTheme(Tcl_Interp *interp) } -declare 3 current { +declare 3 { Ttk_Theme Ttk_CreateTheme( - Tcl_Interp *interp, const char *name, Ttk_Theme parent); + Tcl_Interp *interp, const char *name, Ttk_Theme parent) } -declare 4 current { +declare 4 { void Ttk_RegisterCleanup( - Tcl_Interp *interp, void *deleteData, Ttk_CleanupProc *cleanupProc); + Tcl_Interp *interp, void *deleteData, Ttk_CleanupProc *cleanupProc) } -declare 5 current { +declare 5 { int Ttk_RegisterElementSpec( Ttk_Theme theme, const char *elementName, Ttk_ElementSpec *elementSpec, - void *clientData); + void *clientData) } -declare 6 current { +declare 6 { Ttk_ElementClass *Ttk_RegisterElement( Tcl_Interp *interp, Ttk_Theme theme, const char *elementName, Ttk_ElementSpec *elementSpec, - void *clientData); + void *clientData) } -declare 7 current { +declare 7 { int Ttk_RegisterElementFactory( Tcl_Interp *interp, const char *name, Ttk_ElementFactory factoryProc, - void *clientData); + void *clientData) } -declare 8 current { +declare 8 { void Ttk_RegisterLayout( - Ttk_Theme theme, const char *className, Ttk_LayoutSpec layoutSpec); + Ttk_Theme theme, const char *className, Ttk_LayoutSpec layoutSpec) } # # State maps. # -declare 10 current { +declare 10 { int Ttk_GetStateSpecFromObj( - Tcl_Interp *interp, Tcl_Obj *objPtr, Ttk_StateSpec *spec_rtn); + Tcl_Interp *interp, Tcl_Obj *objPtr, Ttk_StateSpec *spec_rtn) } -declare 11 current { +declare 11 { Tcl_Obj *Ttk_NewStateSpecObj( - unsigned int onbits, unsigned int offbits); + unsigned int onbits, unsigned int offbits) } -declare 12 current { +declare 12 { Ttk_StateMap Ttk_GetStateMapFromObj( - Tcl_Interp *interp, Tcl_Obj *objPtr); + Tcl_Interp *interp, Tcl_Obj *objPtr) } -declare 13 current { +declare 13 { Tcl_Obj *Ttk_StateMapLookup( - Tcl_Interp *interp, Ttk_StateMap map, Ttk_State state); + Tcl_Interp *interp, Ttk_StateMap map, Ttk_State state) } -declare 14 current { +declare 14 { int Ttk_StateTableLookup( - Ttk_StateTable map[], Ttk_State state); + Ttk_StateTable map[], Ttk_State state) } # # Low-level geometry utilities. # -declare 20 current { +declare 20 { int Ttk_GetPaddingFromObj( Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, - Ttk_Padding *pad_rtn); + Ttk_Padding *pad_rtn) } -declare 21 current { +declare 21 { int Ttk_GetBorderFromObj( Tcl_Interp *interp, Tcl_Obj *objPtr, - Ttk_Padding *pad_rtn); + Ttk_Padding *pad_rtn) } -declare 22 current { +declare 22 { int Ttk_GetStickyFromObj( - Tcl_Interp *interp, Tcl_Obj *objPtr, Ttk_Sticky *sticky_rtn); + Tcl_Interp *interp, Tcl_Obj *objPtr, Ttk_Sticky *sticky_rtn) } -declare 23 current { +declare 23 { Ttk_Padding Ttk_MakePadding( - short l, short t, short r, short b); + short l, short t, short r, short b) } -declare 24 current { +declare 24 { Ttk_Padding Ttk_UniformPadding( - short borderWidth); + short borderWidth) } -declare 25 current { - Ttk_Padding Ttk_AddPadding(Ttk_Padding pad1, Ttk_Padding pad2); +declare 25 { + Ttk_Padding Ttk_AddPadding(Ttk_Padding pad1, Ttk_Padding pad2) } -declare 26 current { +declare 26 { Ttk_Padding Ttk_RelievePadding( - Ttk_Padding padding, int relief, int n); + Ttk_Padding padding, int relief, int n) } -declare 27 current { - Ttk_Box Ttk_MakeBox(int x, int y, int width, int height); +declare 27 { + Ttk_Box Ttk_MakeBox(int x, int y, int width, int height) } -declare 28 current { - int Ttk_BoxContains(Ttk_Box box, int x, int y); +declare 28 { + int Ttk_BoxContains(Ttk_Box box, int x, int y) } -declare 29 current { - Ttk_Box Ttk_PackBox(Ttk_Box *cavity, int w, int h, Ttk_Side side); +declare 29 { + Ttk_Box Ttk_PackBox(Ttk_Box *cavity, int w, int h, Ttk_Side side) } -declare 30 current { - Ttk_Box Ttk_StickBox(Ttk_Box parcel, int w, int h, Ttk_Sticky sticky); +declare 30 { + Ttk_Box Ttk_StickBox(Ttk_Box parcel, int w, int h, Ttk_Sticky sticky) } -declare 31 current { - Ttk_Box Ttk_AnchorBox(Ttk_Box parcel, int w, int h, Tk_Anchor anchor); +declare 31 { + Ttk_Box Ttk_AnchorBox(Ttk_Box parcel, int w, int h, Tk_Anchor anchor) } -declare 32 current { - Ttk_Box Ttk_PadBox(Ttk_Box b, Ttk_Padding p); +declare 32 { + Ttk_Box Ttk_PadBox(Ttk_Box b, Ttk_Padding p) } -declare 33 current { - Ttk_Box Ttk_ExpandBox(Ttk_Box b, Ttk_Padding p); +declare 33 { + Ttk_Box Ttk_ExpandBox(Ttk_Box b, Ttk_Padding p) } -declare 34 current { +declare 34 { Ttk_Box Ttk_PlaceBox( - Ttk_Box *cavity, int w, int h, Ttk_Side side, Ttk_Sticky sticky); + Ttk_Box *cavity, int w, int h, Ttk_Side side, Ttk_Sticky sticky) } -declare 35 current { - Tcl_Obj *Ttk_NewBoxObj(Ttk_Box box); +declare 35 { + Tcl_Obj *Ttk_NewBoxObj(Ttk_Box box) } # # Utilities. # -declare 40 current { - int Ttk_GetOrientFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *orient); +declare 40 { + int Ttk_GetOrientFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *orient) } diff --git a/generic/ttk/ttkGenStubs.tcl b/generic/ttk/ttkGenStubs.tcl index d0f8c0d..a96f815 100644 --- a/generic/ttk/ttkGenStubs.tcl +++ b/generic/ttk/ttkGenStubs.tcl @@ -5,34 +5,28 @@ # # # Copyright (c) 1998-1999 by Scriptics Corporation. +# Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net> +# # 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.9 2010/08/19 05:05:55 nijtmans Exp $ # -# SOURCE: tcl/tools/genStubs.tcl, revision 1.20 +# RCS: @(#) $Id: ttkGenStubs.tcl,v 1.10 2010/09/20 21:18:23 nijtmans Exp $ +# +# SOURCE: tcl/tools/genStubs.tcl, revision 1.44 # # CHANGES: -# + Remove xxx_TCL_DECLARED #ifdeffery -# + Use application-defined storage class specifier instead of "EXTERN" -# + Add "epoch" and "revision" fields to stubs table record -# + Remove dead code related to USE_*_STUB_PROCS (emitStubs, makeStub) # + Second argument to "declare" is used as a status guard # instead of a platform guard. -# + Use void (*reserved$i)(void) = 0 instead of void *reserved$i = NULL -# for unused stub entries, in case pointer-to-function and -# pointer-to-object are different sizes. # + Allow trailing semicolon in function declarations -# + stubs table is const-qualified # -package require Tcl 8 +package require Tcl 8.4 namespace eval genStubs { # libraryName -- # # The name of the entire library. This value is used to compute - # the USE_*_STUBS macro, the name of the init file, and others. + # the USE_*_STUBS macro and the name of the init file. variable libraryName "UNKNOWN" @@ -52,9 +46,9 @@ namespace eval genStubs { # scspec -- # # Storage class specifier for external function declarations. - # Normally "extern", may be set to something like XYZAPI + # Normally "EXTERN", may be set to something like XYZAPI # - variable scspec "extern" + variable scspec "EXTERN" # epoch, revision -- # @@ -62,7 +56,7 @@ namespace eval genStubs { # (@@@TODO: should be an array mapping interface names -> numbers) # - variable epoch 0 + variable epoch {} variable revision 0 # hooks -- @@ -183,12 +177,24 @@ proc genStubs::hooks {names} { # decl The C function declaration, or {} for an undefined # entry. # -proc genStubs::declare {index status decl} { +# Results: +# None. + +proc genStubs::declare {args} { variable stubs variable curName variable revision incr revision + if {[llength $args] == 2} { + lassign $args index decl + set status current + } elseif {[llength $args] == 3} { + lassign $args index status decl + } else { + puts stderr "wrong # args: declare $args" + return + } # Check for duplicate declarations, then add the declaration and # bump the lastNum counter if necessary. @@ -229,6 +235,7 @@ proc genStubs::rewriteFile {file text} { } set in [open ${file} r] set out [open ${file}.new w] + fconfigure $out -translation lf while {![eof $in]} { set line [gets $in] @@ -263,22 +270,48 @@ proc genStubs::rewriteFile {file text} { # Results: # Returns the original text inside an appropriate #ifdef. -proc genStubs::addPlatformGuard {plat text} { +proc genStubs::addPlatformGuard {plat iftxt {eltxt {}}} { + set text "" switch $plat { win { - return "#ifdef __WIN32__\n${text}#endif /* __WIN32__ */\n" + append text "#ifdef __WIN32__ /* WIN */\n${iftxt}" + if {$eltxt ne ""} { + append text "#else /* WIN */\n${eltxt}" + } + append text "#endif /* WIN */\n" } unix { - return "#if !defined(__WIN32__) /* UNIX */\n${text}#endif /* UNIX */\n" - } + append text "#if !defined(__WIN32__) && !defined(MAC_OSX_TCL)\ + /* UNIX */\n${iftxt}" + if {$eltxt ne ""} { + append text "#else /* UNIX */\n${eltxt}" + } + append text "#endif /* UNIX */\n" + } macosx { - return "#ifdef MAC_OSX_TCL\n${text}#endif /* MAC_OSX_TCL */\n" + append text "#ifdef MAC_OSX_TCL /* MACOSX */\n${iftxt}" + if {$eltxt ne ""} { + append text "#else /* MACOSX */\n${eltxt}" + } + append text "#endif /* MACOSX */\n" } aqua { - return "#ifdef MAC_OSX_TK\n${text}#endif /* MAC_OSX_TK */\n" + append text "#ifdef MAC_OSX_TK /* AQUA */\n${iftxt}" + if {$eltxt ne ""} { + append text "#else /* AQUA */\n${eltxt}" + } + append text "#endif /* AQUA */\n" } x11 { - return "#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */\n${text}#endif /* X11 */\n" + append text "#if !(defined(__WIN32__) || defined(MAC_OSX_TK))\ + /* X11 */\n${iftxt}" + if {$eltxt ne ""} { + append text "#else /* X11 */\n${eltxt}" + } + append text "#endif /* X11 */\n" + } + default { + append text "${iftxt}${eltxt}" } } return $text @@ -286,7 +319,9 @@ proc genStubs::addPlatformGuard {plat text} { # genStubs::emitSlots -- # -# Generate the stub table slots for the given interface. +# Generate the stub table slots for the given interface. If there +# are no generic slots, then one table is generated for each +# platform, otherwise one table is generated for all platforms. # # Arguments: # name The name of the interface being emitted. @@ -297,6 +332,7 @@ proc genStubs::addPlatformGuard {plat text} { proc genStubs::emitSlots {name textVar} { upvar $textVar text + forAllStubs $name makeSlot noGuard text {" void (*reserved$i)(void);\n"} return } @@ -325,7 +361,7 @@ proc genStubs::parseDecl {decl} { return } set rtype [string trim $rtype] - if {$args == ""} { + if {$args eq ""} { return [list $rtype $fname {}] } foreach arg [split $args ,] { @@ -373,14 +409,14 @@ proc genStubs::parseDecl {decl} { proc genStubs::parseArg {arg} { if {![regexp {^(.+[ ][*]*)([^][ *]+)(\[\])?$} $arg all type name array]} { - if {$arg == "void"} { + if {$arg eq "void"} { return $arg } else { return } } set result [list [string trim $type] $name] - if {$array != ""} { + if {$array ne ""} { lappend result $array } return $result @@ -400,7 +436,6 @@ proc genStubs::parseArg {arg} { proc genStubs::makeDecl {name decl index} { variable scspec - lassign $decl rtype fname args append text "/* $index */\n" @@ -412,7 +447,7 @@ proc genStubs::makeDecl {name decl index} { append line " " set pad 0 } - if {$args == ""} { + if {$args eq ""} { append line $fname append text $line append text ";\n" @@ -490,7 +525,7 @@ proc genStubs::makeMacro {name decl index} { append lfname [string range $fname 1 end] set text "#define $fname \\\n\t(" - if {$args == ""} { + if {$args eq ""} { append text "*" } append text "${name}StubsPtr->$lfname)" @@ -517,12 +552,15 @@ proc genStubs::makeSlot {name decl index} { append lfname [string range $fname 1 end] set text " " - if {$args == ""} { + if {$args eq ""} { append text $rtype " *" $lfname "; /* $index */\n" return $text } - append text $rtype " (*" $lfname ") " - + if {[string range $rtype end-7 end] eq "CALLBACK"} { + append text [string trim [string range $rtype 0 end-8]] " (CALLBACK *" $lfname ") " + } else { + append text $rtype " (*" $lfname ") " + } set arg1 [lindex $args 0] switch -exact $arg1 { void { @@ -571,7 +609,7 @@ proc genStubs::makeSlot {name decl index} { # Returns the formatted declaration string. proc genStubs::makeInit {name decl index} { - if {[lindex $decl 2] == ""} { + if {[lindex $decl 2] eq ""} { append text " &" [lindex $decl 1] ", /* " $index " */\n" } else { append text " " [lindex $decl 1] ", /* " $index " */\n" @@ -600,8 +638,8 @@ proc genStubs::makeInit {name decl index} { # Results: # None. -proc genStubs::forAllStubs {name slotProc guardProc textVar - {skipString {"/* Slot $i is reserved */\n"}}} { +proc genStubs::forAllStubs {name slotProc guardProc textVar + {skipString {"/* Slot $i is reserved */\n"}}} { variable stubs upvar $textVar text @@ -708,10 +746,12 @@ proc genStubs::emitHeader {name} { set capName [string toupper [string index $name 0]] append capName [string range $name 1 end] - set CAPName [string toupper $name] - append text "\n" - append text "#define ${CAPName}_STUBS_EPOCH $epoch\n" - append text "#define ${CAPName}_STUBS_REVISION $revision\n" + if {$epoch ne ""} { + set CAPName [string toupper $name] + append text "\n" + append text "#define ${CAPName}_STUBS_EPOCH $epoch\n" + append text "#define ${CAPName}_STUBS_REVISION $revision\n" + } emitDeclarations $name text @@ -726,8 +766,10 @@ proc genStubs::emitHeader {name} { } append text "\ntypedef struct ${capName}Stubs {\n" append text " int magic;\n" - append text " int epoch;\n" - append text " int revision;\n" + if {$epoch ne ""} { + append text " int epoch;\n" + append text " int revision;\n" + } append text " const struct ${capName}StubHooks *hooks;\n\n" emitSlots $name text @@ -759,14 +801,11 @@ proc genStubs::emitInit {name textVar} { variable hooks variable interfaces variable epoch - variable revision - upvar $textVar text set root 1 set capName [string toupper [string index $name 0]] append capName [string range $name 1 end] - set CAPName [string toupper $name] if {[info exists hooks($name)]} { append text "\nstatic const ${capName}StubHooks ${name}StubHooks = \{\n" @@ -779,21 +818,23 @@ proc genStubs::emitInit {name textVar} { } foreach intf [array names interfaces] { if {[info exists hooks($intf)]} { - if {0<=[lsearch -exact $hooks($intf) $name]} { + if {[lsearch -exact $hooks($intf) $name] >= 0} { set root 0 - break; + break } } } - if {$root} { - append text "\nconst ${capName}Stubs ${name}Stubs = \{\n" - } else { - append text "\nstatic const ${capName}Stubs ${name}Stubs = \{\n" + append text "\n" + if {!$root} { + append text "static " + } + append text "const ${capName}Stubs ${name}Stubs = \{\n TCL_STUB_MAGIC,\n" + if {$epoch ne ""} { + set CAPName [string toupper $name] + append text " ${CAPName}_STUBS_EPOCH,\n" + append text " ${CAPName}_STUBS_REVISION,\n" } - append text " TCL_STUB_MAGIC,\n" - append text " ${CAPName}_STUBS_EPOCH,\n" - append text " ${CAPName}_STUBS_REVISION,\n" if {[info exists hooks($name)]} { append text " &${name}StubHooks,\n" } else { |