diff options
54 files changed, 1093 insertions, 1082 deletions
@@ -3,7 +3,7 @@ '\" '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. -'\" +'\" .TH grid n 8.5 Tk "Tk Built-In Commands" .so man.macros .BS @@ -17,30 +17,30 @@ grid \- Geometry manager that arranges widgets in a grid .PP The \fBgrid\fR command is used to communicate with the grid geometry manager that arranges widgets in rows and columns inside -of another window, called the geometry master (or master window). +of another window, called the geometry container (or container window). The \fBgrid\fR command can have any of several forms, depending on the \fIoption\fR argument: .TP -\fBgrid \fIslave \fR?\fIslave ...\fR? ?\fIoptions\fR? +\fBgrid \fIwindow \fR?\fIwindow ...\fR? ?\fIoptions\fR? . -If the first argument to \fBgrid\fR is suitable as the first slave +If the first argument to \fBgrid\fR is suitable as the first window argument to \fBgrid configure\fR, either a window name (any value starting with \fB.\fR) or one of the characters \fBx\fR or \fB^\fR (see the \fBRELATIVE PLACEMENT\fR section below), then the command is processed in the same way as \fBgrid configure\fR. .TP -\fBgrid anchor \fImaster\fR ?\fIanchor\fR? +\fBgrid anchor \fIwindow\fR ?\fIanchor\fR? . -The anchor value controls how to place the grid within the master +The anchor value controls how to place the grid within the container window when no row/column has any weight. See \fBTHE GRID ALGORITHM\fR below for further details. The default \fIanchor\fR is \fInw\fR. .TP -\fBgrid bbox \fImaster\fR ?\fIcolumn row\fR? ?\fIcolumn2 row2\fR? +\fBgrid bbox \fIwindow\fR ?\fIcolumn row\fR? ?\fIcolumn2 row2\fR? . With no arguments, the bounding box (in pixels) of the grid is returned. The return value consists of 4 integers. The first two are the pixel -offset from the master window (x then y) of the top-left corner of the +offset from the container window (x then y) of the top-left corner of the grid, and the second two integers are the width and height of the grid, also in pixels. If a single \fIcolumn\fR and \fIrow\fR is specified on the command line, then the bounding box for that cell is returned, where the @@ -48,10 +48,10 @@ top left cell is numbered from zero. If both \fIcolumn\fR and \fIrow\fR arguments are specified, then the bounding box spanning the rows and columns indicated is returned. .TP -\fBgrid columnconfigure \fImaster index \fR?\fI\-option value...\fR? +\fBgrid columnconfigure \fIwindow index \fR?\fI\-option value...\fR? . Query or set the column properties of the \fIindex\fR column of the -geometry master, \fImaster\fR. +geometry container, \fIwindow\fR. The valid options are \fB\-minsize\fR, \fB\-weight\fR, \fB\-uniform\fR and \fB\-pad\fR. If one or more options are provided, then \fIindex\fR may be given as @@ -209,41 +209,41 @@ Returns a list whose elements are the current configuration state of the slave given by \fIslave\fR in the same option-value form that might be specified to \fBgrid configure\fR. The first two elements of the list are -.QW "\fB\-in \fImaster\fR" -where \fImaster\fR is the slave's master. +.QW "\fB\-in \fIother\fR" +where \fIother\fR is the windows's container window. .TP -\fBgrid location \fImaster x y\fR +\fBgrid location \fIwindow x y\fR . -Given \fIx\fR and \fIy\fR values in screen units relative to the master window, +Given \fIx\fR and \fIy\fR values in screen units relative to the container window, the column and row number at that \fIx\fR and \fIy\fR location is returned. For locations that are above or to the left of the grid, \fB\-1\fR is returned. .TP -\fBgrid propagate \fImaster\fR ?\fIboolean\fR? +\fBgrid propagate \fIwindow\fR ?\fIboolean\fR? . If \fIboolean\fR has a true boolean value such as \fB1\fR or \fBon\fR -then propagation is enabled for \fImaster\fR, which must be a window +then propagation is enabled for \fIwindow\fR, which must be a window name (see \fBGEOMETRY PROPAGATION\fR below). If \fIboolean\fR has a false boolean value then propagation is -disabled for \fImaster\fR. +disabled for \fIwindow\fR. In either of these cases an empty string is returned. If \fIboolean\fR is omitted then the command returns \fB0\fR or \fB1\fR to indicate whether propagation is currently enabled -for \fImaster\fR. +for \fIwindow\fR. Propagation is enabled by default. .TP -\fBgrid rowconfigure \fImaster index \fR?\fI\-option value...\fR? +\fBgrid rowconfigure \fIwindow index \fR?\fI\-option value...\fR? . Query or set the row properties of the \fIindex\fR row of the -geometry master, \fImaster\fR. +geometry window, \fIwindow\fR. The valid options are \fB\-minsize\fR, \fB\-weight\fR, \fB\-uniform\fR and \fB\-pad\fR. If one or more options are provided, then \fIindex\fR may be given as a list of row indices to which the configuration options will operate on. Indices may be integers, window names or the keyword \fIall\fR. For \fIall\fR -the options apply to all rows currently occupied be slave windows. For -a window name, that window must be a slave of this master and the options -apply to all rows currently occupied be the slave. +the options apply to all rows currently occupied by content windows. For +a window name, that window must be a content window of this container and the options +apply to all rows currently occupied by the container window. The \fB\-minsize\fR option sets the minimum size, in screen units, that will be permitted for this row. The \fB\-weight\fR option (an integer value) @@ -4,7 +4,7 @@ '\" '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. -'\" +'\" .TH pack n 4.0 Tk "Tk Built-In Commands" .so man.macros .BS @@ -83,7 +83,7 @@ Stretch the slave both horizontally and vertically. .RE .TP \fB\-in \fIother\fR -Insert the slave(s) at the end of the packing order for the master +Insert the window at the end of the packing order for the content window given by \fIother\fR. .TP \fB\-ipadx \fIamount\fR diff --git a/doc/place.n b/doc/place.n index 3a092c2..ca30c5d 100644 --- a/doc/place.n +++ b/doc/place.n @@ -4,7 +4,7 @@ '\" '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. -'\" +'\" .TH place n "" Tk "Tk Built-In Commands" .so man.macros .BS @@ -94,16 +94,16 @@ If \fIsize\fR is an empty string, or if no \fB\-height\fR or \fB\-relheight\fR option is specified, then the height requested internally by the window will be used. .TP -\fB\-in \fImaster\fR -\fIMaster\fR specifies the path name of the window relative +\fB\-in \fIother\fR +\fIOther\fR specifies the path name of the window relative to which \fIwindow\fR is to be placed. -\fIMaster\fR must either be \fIwindow\fR's parent or a descendant +\fIOther\fR must either be \fIwindow\fR's parent or a descendant of \fIwindow\fR's parent. -In addition, \fImaster\fR and \fIwindow\fR must both be descendants +In addition, \fIother\fR and \fIwindow\fR must both be descendants of the same top-level window. These restrictions are necessary to guarantee -that \fIwindow\fR is visible whenever \fImaster\fR is visible. -If this option is not specified then the master defaults to +that \fIwindow\fR is visible whenever \fIother\fR is visible. +If this option is not specified then the other window defaults to \fIwindow\fR's parent. .TP \fB\-relheight \fIsize\fR diff --git a/generic/tk.h b/generic/tk.h index 4905aae..ede97ac 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -615,8 +615,9 @@ typedef struct Tk_ClassProcs { * the geometry manager to carry out certain functions. */ +#define Tk_GeomLostContentProc Tk_GeomLostSlaveProc typedef void (Tk_GeomRequestProc) (ClientData clientData, Tk_Window tkwin); -typedef void (Tk_GeomLostSlaveProc) (ClientData clientData, Tk_Window tkwin); +typedef void (Tk_GeomLostContentProc) (ClientData clientData, Tk_Window tkwin); typedef struct Tk_GeomMgr { const char *name; /* Name of the geometry manager (command used @@ -625,7 +626,7 @@ typedef struct Tk_GeomMgr { Tk_GeomRequestProc *requestProc; /* Procedure to invoke when a slave's * requested geometry changes. */ - Tk_GeomLostSlaveProc *lostSlaveProc; + Tk_GeomLostContentProc *lostSlaveProc; /* Procedure to invoke when a slave is taken * away from one geometry manager by another. * NULL means geometry manager doesn't care diff --git a/generic/tkGeometry.c b/generic/tkGeometry.c index 870c1f3..a8c3f2b 100644 --- a/generic/tkGeometry.c +++ b/generic/tkGeometry.c @@ -90,7 +90,7 @@ Tk_ManageGeometry( ClientData clientData) /* Arbitrary one-word argument to pass to * geometry manager procedures. */ { - register TkWindow *winPtr = (TkWindow *) tkwin; + TkWindow *winPtr = (TkWindow *) tkwin; if ((winPtr->geomMgrPtr != NULL) && (mgrPtr != NULL) && ((winPtr->geomMgrPtr != mgrPtr) @@ -132,7 +132,7 @@ Tk_GeometryRequest( int reqWidth, int reqHeight)/* Minimum desired dimensions for window, in * pixels. */ { - register TkWindow *winPtr = (TkWindow *) tkwin; + TkWindow *winPtr = (TkWindow *) tkwin; /* * X gets very upset if a window requests a width or height of zero, so @@ -182,8 +182,8 @@ Tk_SetInternalBorderEx( int left, int right, /* Width of internal border, in pixels. */ int top, int bottom) { - register TkWindow *winPtr = (TkWindow *) tkwin; - register int changed = 0; + TkWindow *winPtr = (TkWindow *) tkwin; + int changed = 0; if (left < 0) { left = 0; @@ -279,7 +279,7 @@ Tk_SetMinimumRequestSize( Tk_Window tkwin, /* Window that will have internal border. */ int minWidth, int minHeight)/* Minimum requested size, in pixels. */ { - register TkWindow *winPtr = (TkWindow *) tkwin; + TkWindow *winPtr = (TkWindow *) tkwin; if ((winPtr->minReqWidth == minWidth) && (winPtr->minReqHeight == minHeight)) { @@ -303,31 +303,31 @@ Tk_SetMinimumRequestSize( /* *---------------------------------------------------------------------- * - * TkSetGeometryMaster -- + * TkSetGeometryContainer -- * - * Set a geometry master for this window. Only one master may own + * Set a geometry container for this window. Only one container may own * a window at any time. * * Results: * A standard Tcl result. * * Side effects: - * The geometry master is recorded for the window. + * The geometry container is recorded for the window. * *---------------------------------------------------------------------- */ int -TkSetGeometryMaster( +TkSetGeometryContainer( Tcl_Interp *interp, /* Current interpreter, for error. */ - Tk_Window tkwin, /* Window that will have geometry master + Tk_Window tkwin, /* Window that will have geometry container * set. */ - const char *master) /* The master identity. */ + const char *name) /* The name of the geometry manager. */ { - register TkWindow *winPtr = (TkWindow *) tkwin; + TkWindow *winPtr = (TkWindow *) tkwin; if (winPtr->geomMgrName != NULL && - strcmp(winPtr->geomMgrName, master) == 0) { + strcmp(winPtr->geomMgrName, name) == 0) { return TCL_OK; } if (winPtr->geomMgrName != NULL) { @@ -335,46 +335,46 @@ TkSetGeometryMaster( Tcl_SetObjResult(interp, Tcl_ObjPrintf( "cannot use geometry manager %s inside %s which already" " has slaves managed by %s", - master, Tk_PathName(tkwin), winPtr->geomMgrName)); + name, Tk_PathName(tkwin), winPtr->geomMgrName)); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "FIGHT", NULL); } return TCL_ERROR; } - winPtr->geomMgrName = ckalloc(strlen(master) + 1); - strcpy(winPtr->geomMgrName, master); + winPtr->geomMgrName = ckalloc(strlen(name) + 1); + strcpy(winPtr->geomMgrName, name); return TCL_OK; } /* *---------------------------------------------------------------------- * - * TkFreeGeometryMaster -- + * TkFreeGeometryContainer -- * - * Remove a geometry master for this window. Only one master may own + * Remove a geometry container for this window. Only one container may own * a window at any time. * * Results: * None. * * Side effects: - * The geometry master is cleared for the window. + * The geometry container is cleared for the window. * *---------------------------------------------------------------------- */ void -TkFreeGeometryMaster( - Tk_Window tkwin, /* Window that will have geometry master +TkFreeGeometryContainer( + Tk_Window tkwin, /* Window that will have geometry container * cleared. */ - const char *master) /* The master identity. */ + const char *name) /* The name of the geometry manager. */ { - register TkWindow *winPtr = (TkWindow *) tkwin; + TkWindow *winPtr = (TkWindow *) tkwin; if (winPtr->geomMgrName != NULL && - strcmp(winPtr->geomMgrName, master) != 0) { + strcmp(winPtr->geomMgrName, name) != 0) { Tcl_Panic("Trying to free %s from geometry manager %s", - winPtr->geomMgrName, master); + winPtr->geomMgrName, name); } if (winPtr->geomMgrName != NULL) { ckfree(winPtr->geomMgrName); @@ -419,7 +419,7 @@ Tk_MaintainGeometry( { Tcl_HashEntry *hPtr; MaintainMaster *masterPtr; - register MaintainSlave *slavePtr; + MaintainSlave *slavePtr; int isNew, map; Tk_Window ancestor, parent; TkDisplay *dispPtr = ((TkWindow *) master)->dispPtr; @@ -568,7 +568,7 @@ Tk_UnmaintainGeometry( { Tcl_HashEntry *hPtr; MaintainMaster *masterPtr; - register MaintainSlave *slavePtr, *prevPtr; + MaintainSlave *slavePtr, *prevPtr; Tk_Window ancestor; TkDisplay *dispPtr = ((TkWindow *) slave)->dispPtr; diff --git a/generic/tkGrid.c b/generic/tkGrid.c index 41f5213..9f08b02 100644 --- a/generic/tkGrid.c +++ b/generic/tkGrid.c @@ -260,7 +260,7 @@ static int AdjustOffsets(int width, int elements, static void ArrangeGrid(ClientData clientData); static int CheckSlotData(Gridder *containerPtr, int slot, int slotType, int checkOnly); -static int ConfigureSlaves(Tcl_Interp *interp, Tk_Window tkwin, +static int ConfigureContent(Tcl_Interp *interp, Tk_Window tkwin, int objc, Tcl_Obj *const objv[]); static void DestroyGrid(void *memPtr); static Gridder * GetGrid(Tk_Window tkwin); @@ -353,7 +353,7 @@ Tk_GridObjCmd( if ((argv1[0] == '.') || (argv1[0] == REL_SKIP) || (argv1[0] == REL_VERT)) { - return ConfigureSlaves(interp, tkwin, objc-1, objv+1); + return ConfigureContent(interp, tkwin, objc-1, objv+1); } } if (objc < 3) { @@ -372,7 +372,7 @@ Tk_GridObjCmd( case GRID_BBOX: return GridBboxCommand(tkwin, interp, objc, objv); case GRID_CONFIGURE: - return ConfigureSlaves(interp, tkwin, objc-2, objv+2); + return ConfigureContent(interp, tkwin, objc-2, objv+2); case GRID_FORGET: case GRID_REMOVE: return GridForgetRemoveCommand(tkwin, interp, objc, objv); @@ -721,7 +721,7 @@ GridInfoCommand( int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { - register Gridder *slavePtr; + Gridder *slavePtr; Tk_Window slave; Tcl_Obj *infoObj; @@ -786,7 +786,7 @@ GridLocationCommand( Tk_Window container; Gridder *containerPtr; /* Master grid record. */ GridMaster *gridPtr; /* Pointer to grid data. */ - register SlotInfo *slotPtr; + SlotInfo *slotPtr; int x, y; /* Offset in pixels, from edge of container. */ int i, j; /* Corresponding column and row indeces. */ int endX, endY; /* End of grid. */ @@ -910,7 +910,7 @@ GridPropagateCommand( */ if (containerPtr->slavePtr != NULL) { - if (TkSetGeometryMaster(interp, container, "grid") != TCL_OK) { + if (TkSetGeometryContainer(interp, container, "grid") != TCL_OK) { return TCL_ERROR; } containerPtr->flags |= ALLOCED_CONTAINER; @@ -918,7 +918,7 @@ GridPropagateCommand( containerPtr->flags &= ~DONT_PROPAGATE; } else { if (containerPtr->flags & ALLOCED_CONTAINER) { - TkFreeGeometryMaster(container, "grid"); + TkFreeGeometryContainer(container, "grid"); containerPtr->flags &= ~ALLOCED_CONTAINER; } containerPtr->flags |= DONT_PROPAGATE; @@ -1432,7 +1432,7 @@ GridReqProc( Tk_Window tkwin) /* Other Tk-related information about the * window. */ { - register Gridder *gridPtr = clientData; + Gridder *gridPtr = clientData; gridPtr = gridPtr->containerPtr; if (gridPtr && !(gridPtr->flags & REQUESTED_RELAYOUT)) { @@ -1464,7 +1464,7 @@ GridLostSlaveProc( * stolen away. */ Tk_Window tkwin) /* Tk's handle for the slave window. */ { - register Gridder *slavePtr = clientData; + Gridder *slavePtr = clientData; if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) { Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin); @@ -1497,9 +1497,9 @@ static int AdjustOffsets( int size, /* The total layout size (in pixels). */ int slots, /* Number of slots. */ - register SlotInfo *slotPtr) /* Pointer to slot array. */ + SlotInfo *slotPtr) /* Pointer to slot array. */ { - register int slot; /* Current slot. */ + int slot; /* Current slot. */ int diff; /* Extra pixels needed to add to the layout. */ int totalWeight; /* Sum of the weights for all the slots. */ int weight; /* Sum of the weights so far. */ @@ -1722,8 +1722,8 @@ ArrangeGrid( ClientData clientData) /* Structure describing container whose slaves * are to be re-layed out. */ { - register Gridder *containerPtr = clientData; - register Gridder *slavePtr; + Gridder *containerPtr = clientData; + Gridder *slavePtr; GridMaster *slotPtr = containerPtr->containerDataPtr; int abort; int width, height; /* Requested size of layout, in pixels. */ @@ -1904,8 +1904,8 @@ ResolveConstraints( int maxOffset) /* The actual maximum size of this layout in * pixels, or 0 (not currently used). */ { - register SlotInfo *slotPtr; /* Pointer to row/col constraints. */ - register Gridder *slavePtr; /* List of slave windows in this grid. */ + SlotInfo *slotPtr; /* Pointer to row/col constraints. */ + Gridder *slavePtr; /* List of slave windows in this grid. */ int constraintCount; /* Count of rows or columns that have * constraints. */ int slotCount; /* Last occupied row or column. */ @@ -2423,7 +2423,7 @@ GetGrid( Tk_Window tkwin) /* Token for window for which grid structure * is desired. */ { - register Gridder *gridPtr; + Gridder *gridPtr; Tcl_HashEntry *hPtr; int isNew; TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr; @@ -2496,7 +2496,7 @@ static void SetGridSize( Gridder *containerPtr) /* The geometry container for this grid. */ { - register Gridder *slavePtr; /* Current slave window. */ + Gridder *slavePtr; /* Current slave window. */ int maxX = 0, maxY = 0; for (slavePtr = containerPtr->slavePtr; slavePtr != NULL; @@ -2742,9 +2742,9 @@ InitMasterData( static void Unlink( - register Gridder *slavePtr) /* Window to unlink. */ + Gridder *slavePtr) /* Window to unlink. */ { - register Gridder *containerPtr, *slavePtr2; + Gridder *containerPtr, *slavePtr2; containerPtr = slavePtr->containerPtr; if (containerPtr == NULL) { @@ -2781,7 +2781,7 @@ Unlink( */ if ((containerPtr->slavePtr == NULL) && (containerPtr->flags & ALLOCED_CONTAINER)) { - TkFreeGeometryMaster(containerPtr->tkwin, "grid"); + TkFreeGeometryContainer(containerPtr->tkwin, "grid"); containerPtr->flags &= ~ALLOCED_CONTAINER; } } @@ -2810,7 +2810,7 @@ static void DestroyGrid( void *memPtr) /* Info about window that is now dead. */ { - register Gridder *gridPtr = memPtr; + Gridder *gridPtr = memPtr; if (gridPtr->containerDataPtr != NULL) { if (gridPtr->containerDataPtr->rowPtr != NULL) { @@ -2851,7 +2851,7 @@ GridStructureProc( * eventPtr. */ XEvent *eventPtr) /* Describes what just happened. */ { - register Gridder *gridPtr = clientData; + Gridder *gridPtr = clientData; TkDisplay *dispPtr = ((TkWindow *) gridPtr->tkwin)->dispPtr; if (eventPtr->type == ConfigureNotify) { @@ -2869,7 +2869,7 @@ GridStructureProc( } } } else if (eventPtr->type == DestroyNotify) { - register Gridder *slavePtr, *nextPtr; + Gridder *slavePtr, *nextPtr; if (gridPtr->containerPtr != NULL) { Unlink(gridPtr); @@ -2896,7 +2896,7 @@ GridStructureProc( Tcl_DoWhenIdle(ArrangeGrid, gridPtr); } } else if (eventPtr->type == UnmapNotify) { - register Gridder *slavePtr; + Gridder *slavePtr; for (slavePtr = gridPtr->slavePtr; slavePtr != NULL; slavePtr = slavePtr->nextPtr) { @@ -2908,7 +2908,7 @@ GridStructureProc( /* *---------------------------------------------------------------------- * - * ConfigureSlaves -- + * ConfigureContent -- * * This implements the guts of the "grid configure" command. Given a list * of slaves and configuration options, it arranges for the grid to @@ -2926,7 +2926,7 @@ GridStructureProc( */ static int -ConfigureSlaves( +ConfigureContent( Tcl_Interp *interp, /* Interpreter for error reporting. */ Tk_Window tkwin, /* Any window in application containing * slaves. Used to look up slave names. */ @@ -3375,7 +3375,7 @@ ConfigureSlaves( Tk_ManageGeometry(slave, &gridMgrType, slavePtr); if (!(containerPtr->flags & DONT_PROPAGATE)) { - if (TkSetGeometryMaster(interp, containerPtr->tkwin, "grid") + if (TkSetGeometryContainer(interp, containerPtr->tkwin, "grid") != TCL_OK) { Tk_ManageGeometry(slave, NULL, NULL); Unlink(slavePtr); @@ -3520,7 +3520,7 @@ ConfigureSlaves( */ if (containerPtr->slavePtr == NULL && containerPtr->flags & ALLOCED_CONTAINER) { - TkFreeGeometryMaster(containerPtr->tkwin, "grid"); + TkFreeGeometryContainer(containerPtr->tkwin, "grid"); containerPtr->flags &= ~ALLOCED_CONTAINER; } diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c index a5c21bb..8d51671 100644 --- a/generic/tkImgBmap.c +++ b/generic/tkImgBmap.c @@ -149,7 +149,7 @@ static int ImgBmapCmd(ClientData clientData, Tcl_Interp *interp, int argc, Tcl_Obj *const objv[]); static void ImgBmapCmdDeletedProc(ClientData clientData); static void ImgBmapConfigureInstance(BitmapInstance *instancePtr); -static int ImgBmapConfigureMaster(BitmapModel *modelPtr, +static int ImgBmapConfigureModel(BitmapModel *modelPtr, int argc, Tcl_Obj *const objv[], int flags); static int NextBitmapWord(ParseInfo *parseInfoPtr); @@ -200,7 +200,7 @@ ImgBmapCreate( modelPtr->maskFileString = NULL; modelPtr->maskDataString = NULL; modelPtr->instancePtr = NULL; - if (ImgBmapConfigureMaster(modelPtr, argc, argv, 0) != TCL_OK) { + if (ImgBmapConfigureModel(modelPtr, argc, argv, 0) != TCL_OK) { ImgBmapDelete(modelPtr); return TCL_ERROR; } @@ -211,7 +211,7 @@ ImgBmapCreate( /* *---------------------------------------------------------------------- * - * ImgBmapConfigureMaster -- + * ImgBmapConfigureModel -- * * This procedure is called when a bitmap image is created or * reconfigured. It process configuration options and resets any @@ -229,7 +229,7 @@ ImgBmapCreate( */ static int -ImgBmapConfigureMaster( +ImgBmapConfigureModel( BitmapModel *modelPtr, /* Pointer to data structure describing * overall bitmap image to (reconfigure). */ int objc, /* Number of entries in objv. */ @@ -785,7 +785,7 @@ ImgBmapCmd( configSpecs, (char *) modelPtr, Tcl_GetString(objv[2]), 0); } else { - return ImgBmapConfigureMaster(modelPtr, objc-2, objv+2, + return ImgBmapConfigureModel(modelPtr, objc-2, objv+2, TK_CONFIG_ARGV_ONLY); } default: diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index 395fc9d..765b8a2 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -176,7 +176,7 @@ static int ParseSubcommandOptions( Tcl_Interp *interp, int allowedOptions, int *indexPtr, int objc, Tcl_Obj *const objv[]); static void ImgPhotoCmdDeletedProc(ClientData clientData); -static int ImgPhotoConfigureMaster(Tcl_Interp *interp, +static int ImgPhotoConfigureModel(Tcl_Interp *interp, PhotoModel *modelPtr, int objc, Tcl_Obj *const objv[], int flags); static int ToggleComplexAlphaIfNeeded(PhotoModel *mPtr); @@ -357,7 +357,7 @@ ImgPhotoCreate( * Process configuration options given in the image create command. */ - if (ImgPhotoConfigureMaster(interp, modelPtr, objc, objv, 0) != TCL_OK) { + if (ImgPhotoConfigureModel(interp, modelPtr, objc, objv, 0) != TCL_OK) { ImgPhotoDelete(modelPtr); return TCL_ERROR; } @@ -532,7 +532,7 @@ ImgPhotoCmd( configSpecs, (char *) modelPtr, arg, 0); } } else { - return ImgPhotoConfigureMaster(interp, modelPtr, objc-2, objv+2, + return ImgPhotoConfigureModel(interp, modelPtr, objc-2, objv+2, TK_CONFIG_ARGV_ONLY); } @@ -1759,7 +1759,7 @@ ParseSubcommandOptions( /* *---------------------------------------------------------------------- * - * ImgPhotoConfigureMaster -- + * ImgPhotoConfigureModel -- * * This function is called when a photo image is created or reconfigured. * It processes configuration options and resets any instances of the @@ -1777,7 +1777,7 @@ ParseSubcommandOptions( */ static int -ImgPhotoConfigureMaster( +ImgPhotoConfigureModel( Tcl_Interp *interp, /* Interpreter to use for reporting errors. */ PhotoModel *modelPtr, /* Pointer to data structure describing * overall photo image to (re)configure. */ diff --git a/generic/tkInt.h b/generic/tkInt.h index 9c61c20..f4bb23f 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -860,9 +860,9 @@ typedef struct TkWindow { #endif /* TK_USE_INPUT_METHODS */ char *geomMgrName; /* Records the name of the geometry manager. */ struct TkWindow *maintainerPtr; - /* The geometry master for this window. The - * value is NULL if the window has no master or - * if its master is its parent. */ + /* The geometry container for this window. The + * value is NULL if the window has no container or + * if its container is its parent. */ } TkWindow; /* @@ -1220,10 +1220,12 @@ MODULE_SCOPE int Tk_WmObjCmd(ClientData clientData, Tcl_Interp *interp, MODULE_SCOPE int Tk_GetDoublePixelsFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, double *doublePtr); -MODULE_SCOPE int TkSetGeometryMaster(Tcl_Interp *interp, - Tk_Window tkwin, const char *master); -MODULE_SCOPE void TkFreeGeometryMaster(Tk_Window tkwin, - const char *master); +#define TkSetGeometryContainer TkSetGeometryMaster +MODULE_SCOPE int TkSetGeometryContainer(Tcl_Interp *interp, + Tk_Window tkwin, const char *name); +#define TkFreeGeometryContainer TkFreeGeometryMaster +MODULE_SCOPE void TkFreeGeometryContainer(Tk_Window tkwin, + const char *name); MODULE_SCOPE void TkEventInit(void); MODULE_SCOPE void TkRegisterObjTypes(void); diff --git a/generic/tkPack.c b/generic/tkPack.c index 50cd3b8..0272e5b 100644 --- a/generic/tkPack.c +++ b/generic/tkPack.c @@ -88,7 +88,7 @@ typedef struct Packer { * Tk will set its requested size to fit the * needs of its slaves. * ALLOCED_CONTAINER 1 means that Pack has allocated itself as - * geometry master for this window. + * geometry container for this window. */ #define REQUESTED_REPACK 1 @@ -104,13 +104,13 @@ typedef struct Packer { */ static void PackReqProc(ClientData clientData, Tk_Window tkwin); -static void PackLostSlaveProc(ClientData clientData, +static void PackLostContentProc(ClientData clientData, Tk_Window tkwin); static const Tk_GeomMgr packerType = { "pack", /* name */ PackReqProc, /* requestProc */ - PackLostSlaveProc, /* lostSlaveProc */ + PackLostContentProc, /* lostSlaveProc */ }; /* @@ -118,7 +118,7 @@ static const Tk_GeomMgr packerType = { */ static void ArrangePacking(ClientData clientData); -static int ConfigureSlaves(Tcl_Interp *interp, Tk_Window tkwin, +static int ConfigureContent(Tcl_Interp *interp, Tk_Window tkwin, int objc, Tcl_Obj *const objv[]); static void DestroyPacker(void *memPtr); static Packer * GetPacker(Tk_Window tkwin); @@ -209,7 +209,7 @@ Tk_PackObjCmd( const char *string = Tcl_GetString(objv[1]); if (string[0] == '.') { - return ConfigureSlaves(interp, tkwin, objc-1, objv+1); + return ConfigureContent(interp, tkwin, objc-1, objv+1); } } if (objc < 3) { @@ -251,7 +251,7 @@ Tk_PackObjCmd( } case PACK_APPEND: { Packer *containerPtr; - register Packer *prevPtr; + Packer *prevPtr; Tk_Window tkwin2; if (TkGetWindowFromObj(interp, tkwin, objv[2], &tkwin2) != TCL_OK) { @@ -268,7 +268,7 @@ Tk_PackObjCmd( } case PACK_BEFORE: { Packer *packPtr, *containerPtr; - register Packer *prevPtr; + Packer *prevPtr; Tk_Window tkwin2; if (TkGetWindowFromObj(interp, tkwin, objv[2], &tkwin2) != TCL_OK) { @@ -304,7 +304,7 @@ Tk_PackObjCmd( Tcl_SetErrorCode(interp, "TK", "VALUE", "WINDOW_PATH", NULL); return TCL_ERROR; } - return ConfigureSlaves(interp, tkwin, objc-2, objv+2); + return ConfigureContent(interp, tkwin, objc-2, objv+2); case PACK_FORGET: { Tk_Window slave; Packer *slavePtr; @@ -328,7 +328,7 @@ Tk_PackObjCmd( break; } case PACK_INFO: { - register Packer *slavePtr; + Packer *slavePtr; Tk_Window slave; Tcl_Obj *infoObj; @@ -404,11 +404,11 @@ Tk_PackObjCmd( } if (propagate) { /* - * If we have slaves, we need to register as geometry master. + * If we have content windows, we need to register as geometry container. */ if (containerPtr->slavePtr != NULL) { - if (TkSetGeometryMaster(interp, master, "pack") != TCL_OK) { + if (TkSetGeometryContainer(interp, master, "pack") != TCL_OK) { return TCL_ERROR; } containerPtr->flags |= ALLOCED_CONTAINER; @@ -429,7 +429,7 @@ Tk_PackObjCmd( } } else { if (containerPtr->flags & ALLOCED_CONTAINER) { - TkFreeGeometryMaster(master, "pack"); + TkFreeGeometryContainer(master, "pack"); containerPtr->flags &= ~ALLOCED_CONTAINER; } containerPtr->flags |= DONT_PROPAGATE; @@ -513,7 +513,7 @@ PackReqProc( Tk_Window tkwin) /* Other Tk-related information about the * window. */ { - register Packer *packPtr = clientData; + Packer *packPtr = clientData; packPtr = packPtr->containerPtr; if (!(packPtr->flags & REQUESTED_REPACK)) { @@ -525,10 +525,10 @@ PackReqProc( /* *------------------------------------------------------------------------ * - * PackLostSlaveProc -- + * PackLostContentProc -- * * This function is invoked by Tk whenever some other geometry claims - * control over a slave that used to be managed by us. + * control over a content window that used to be managed by us. * * Results: * None. @@ -541,12 +541,12 @@ PackReqProc( /* ARGSUSED */ static void -PackLostSlaveProc( +PackLostContentProc( ClientData clientData, /* Packer structure for slave window that was * stolen away. */ Tk_Window tkwin) /* Tk's handle for the slave window. */ { - register Packer *slavePtr = clientData; + Packer *slavePtr = clientData; if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) { Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin); @@ -579,8 +579,8 @@ ArrangePacking( ClientData clientData) /* Structure describing master whose slaves * are to be re-layed out. */ { - register Packer *containerPtr = clientData; - register Packer *slavePtr; + Packer *containerPtr = clientData; + Packer *slavePtr; int cavityX, cavityY, cavityWidth, cavityHeight; /* These variables keep track of the * as-yet-unallocated space remaining in the @@ -902,7 +902,7 @@ ArrangePacking( static int XExpansion( - register Packer *slavePtr, /* First in list of remaining slaves. */ + Packer *slavePtr, /* First in list of remaining slaves. */ int cavityWidth) /* Horizontal space left for all remaining * slaves. */ { @@ -968,7 +968,7 @@ XExpansion( static int YExpansion( - register Packer *slavePtr, /* First in list of remaining slaves. */ + Packer *slavePtr, /* First in list of remaining slaves. */ int cavityHeight) /* Vertical space left for all remaining * slaves. */ { @@ -1031,7 +1031,7 @@ GetPacker( Tk_Window tkwin) /* Token for window for which packer structure * is desired. */ { - register Packer *packPtr; + Packer *packPtr; Tcl_HashEntry *hPtr; int isNew; TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr; @@ -1100,7 +1100,7 @@ PackAfter( * window name and side against which to * pack. */ { - register Packer *packPtr; + Packer *packPtr; Tk_Window tkwin, ancestor, parent; Tcl_Obj **options; int index, optionCount, c; @@ -1284,7 +1284,7 @@ PackAfter( Tk_ManageGeometry(tkwin, &packerType, packPtr); if (!(containerPtr->flags & DONT_PROPAGATE)) { - if (TkSetGeometryMaster(interp, containerPtr->tkwin, "pack") + if (TkSetGeometryContainer(interp, containerPtr->tkwin, "pack") != TCL_OK) { Tk_ManageGeometry(tkwin, NULL, NULL); Unlink(packPtr); @@ -1327,9 +1327,9 @@ PackAfter( static void Unlink( - register Packer *packPtr) /* Window to unlink. */ + Packer *packPtr) /* Window to unlink. */ { - register Packer *containerPtr, *packPtr2; + Packer *containerPtr, *packPtr2; containerPtr = packPtr->containerPtr; if (containerPtr == NULL) { @@ -1364,7 +1364,7 @@ Unlink( */ if ((containerPtr->slavePtr == NULL) && (containerPtr->flags & ALLOCED_CONTAINER)) { - TkFreeGeometryMaster(containerPtr->tkwin, "pack"); + TkFreeGeometryContainer(containerPtr->tkwin, "pack"); containerPtr->flags &= ~ALLOCED_CONTAINER; } @@ -1393,7 +1393,7 @@ DestroyPacker( void *memPtr) /* Info about packed window that is now * dead. */ { - register Packer *packPtr = memPtr; + Packer *packPtr = memPtr; ckfree(packPtr); } @@ -1422,7 +1422,7 @@ PackStructureProc( * eventPtr. */ XEvent *eventPtr) /* Describes what just happened. */ { - register Packer *packPtr = clientData; + Packer *packPtr = clientData; if (eventPtr->type == ConfigureNotify) { if ((packPtr->slavePtr != NULL) @@ -1439,7 +1439,7 @@ PackStructureProc( } } } else if (eventPtr->type == DestroyNotify) { - register Packer *slavePtr, *nextPtr; + Packer *slavePtr, *nextPtr; if (packPtr->containerPtr != NULL) { Unlink(packPtr); @@ -1477,7 +1477,7 @@ PackStructureProc( Tcl_DoWhenIdle(ArrangePacking, packPtr); } } else if (eventPtr->type == UnmapNotify) { - register Packer *packPtr2; + Packer *packPtr2; /* * Unmap all of the slaves when the master gets unmapped, so that they @@ -1494,7 +1494,7 @@ PackStructureProc( /* *---------------------------------------------------------------------- * - * ConfigureSlaves -- + * ConfigureContent -- * * This implements the guts of the "pack configure" command. Given a list * of slaves and configuration options, it arranges for the packer to @@ -1511,7 +1511,7 @@ PackStructureProc( */ static int -ConfigureSlaves( +ConfigureContent( Tcl_Interp *interp, /* Interpreter for error reporting. */ Tk_Window tkwin, /* Any window in application containing * slaves. Used to look up slave names. */ @@ -1845,7 +1845,7 @@ ConfigureSlaves( prevPtr = slavePtr; if (!(containerPtr->flags & DONT_PROPAGATE)) { - if (TkSetGeometryMaster(interp, containerPtr->tkwin, "pack") + if (TkSetGeometryContainer(interp, containerPtr->tkwin, "pack") != TCL_OK) { Tk_ManageGeometry(slave, NULL, NULL); Unlink(slavePtr); diff --git a/generic/tkPlace.c b/generic/tkPlace.c index 271b92a..d044fa9 100644 --- a/generic/tkPlace.c +++ b/generic/tkPlace.c @@ -155,13 +155,13 @@ typedef struct Master { static void PlaceRequestProc(ClientData clientData, Tk_Window tkwin); -static void PlaceLostSlaveProc(ClientData clientData, +static void PlaceLostContentProc(ClientData clientData, Tk_Window tkwin); static const Tk_GeomMgr placerType = { "place", /* name */ PlaceRequestProc, /* requestProc */ - PlaceLostSlaveProc, /* lostSlaveProc */ + PlaceLostContentProc, /* lostSlaveProc */ }; /* @@ -170,7 +170,7 @@ static const Tk_GeomMgr placerType = { static void SlaveStructureProc(ClientData clientData, XEvent *eventPtr); -static int ConfigureSlave(Tcl_Interp *interp, Tk_Window tkwin, +static int ConfigureContent(Tcl_Interp *interp, Tk_Window tkwin, Tk_OptionTable table, int objc, Tcl_Obj *const objv[]); static int PlaceInfoCommand(Tcl_Interp *interp, Tk_Window tkwin); @@ -179,7 +179,7 @@ static void FreeSlave(Slave *slavePtr); static Slave * FindSlave(Tk_Window tkwin); static Master * CreateMaster(Tk_Window tkwin); static Master * FindMaster(Tk_Window tkwin); -static void MasterStructureProc(ClientData clientData, +static void PlaceStructureProc(ClientData clientData, XEvent *eventPtr); static void RecomputePlacement(ClientData clientData); static void UnlinkSlave(Slave *slavePtr); @@ -252,7 +252,7 @@ Tk_PlaceObjCmd( dispPtr->placeInit = 1; } - return ConfigureSlave(interp, tkwin, optionTable, objc-2, objv+2); + return ConfigureContent(interp, tkwin, optionTable, objc-2, objv+2); } /* @@ -298,7 +298,7 @@ Tk_PlaceObjCmd( Tcl_SetObjResult(interp, objPtr); return TCL_OK; } - return ConfigureSlave(interp, tkwin, optionTable, objc-3, objv+3); + return ConfigureContent(interp, tkwin, optionTable, objc-3, objv+3); case PLACE_FORGET: if (objc != 3) { @@ -379,7 +379,7 @@ CreateSlave( Tk_OptionTable table) { Tcl_HashEntry *hPtr; - register Slave *slavePtr; + Slave *slavePtr; int isNew; TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr; @@ -453,7 +453,7 @@ static Slave * FindSlave( Tk_Window tkwin) /* Token for desired slave. */ { - register Tcl_HashEntry *hPtr; + Tcl_HashEntry *hPtr; TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr; hPtr = Tcl_FindHashEntry(&dispPtr->slaveTable, (char *) tkwin); @@ -484,8 +484,8 @@ static void UnlinkSlave( Slave *slavePtr) /* Slave structure to be unlinked. */ { - register Master *containerPtr; - register Slave *prevPtr; + Master *containerPtr; + Slave *prevPtr; containerPtr = slavePtr->containerPtr; if (containerPtr == NULL) { @@ -533,7 +533,7 @@ CreateMaster( Tk_Window tkwin) /* Token for desired container. */ { Tcl_HashEntry *hPtr; - register Master *containerPtr; + Master *containerPtr; int isNew; TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr; @@ -546,7 +546,7 @@ CreateMaster( containerPtr->flags = 0; Tcl_SetHashValue(hPtr, containerPtr); Tk_CreateEventHandler(containerPtr->tkwin, StructureNotifyMask, - MasterStructureProc, containerPtr); + PlaceStructureProc, containerPtr); } else { containerPtr = Tcl_GetHashValue(hPtr); } @@ -576,7 +576,7 @@ static Master * FindMaster( Tk_Window tkwin) /* Token for desired container. */ { - register Tcl_HashEntry *hPtr; + Tcl_HashEntry *hPtr; TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr; hPtr = Tcl_FindHashEntry(&dispPtr->masterTable, (char *) tkwin); @@ -589,7 +589,7 @@ FindMaster( /* *---------------------------------------------------------------------- * - * ConfigureSlave -- + * ConfigureContent -- * * This function is called to process an argv/argc list to reconfigure * the placement of a window. @@ -606,14 +606,14 @@ FindMaster( */ static int -ConfigureSlave( +ConfigureContent( Tcl_Interp *interp, /* Used for error reporting. */ Tk_Window tkwin, /* Token for the window to manipulate. */ Tk_OptionTable table, /* Token for option table. */ int objc, /* Number of config arguments. */ Tcl_Obj *const objv[]) /* Object values for arguments. */ { - register Master *containerPtr; + Master *containerPtr; Tk_SavedOptions savedOptions; int mask; Slave *slavePtr; @@ -864,8 +864,8 @@ static void RecomputePlacement( ClientData clientData) /* Pointer to Master record. */ { - register Master *containerPtr = clientData; - register Slave *slavePtr; + Master *containerPtr = clientData; + Slave *slavePtr; int x, y, width, height, tmp; int containerWidth, containerHeight, containerX, containerY; double x1, y1, x2, y2; @@ -1064,7 +1064,7 @@ RecomputePlacement( /* *---------------------------------------------------------------------- * - * MasterStructureProc -- + * PlaceStructureProc -- * * This function is invoked by the Tk event handler when StructureNotify * events occur for a container window. @@ -1080,13 +1080,13 @@ RecomputePlacement( */ static void -MasterStructureProc( +PlaceStructureProc( ClientData clientData, /* Pointer to Master structure for window * referred to by eventPtr. */ XEvent *eventPtr) /* Describes what just happened. */ { - register Master *containerPtr = clientData; - register Slave *slavePtr, *nextPtr; + Master *containerPtr = clientData; + Slave *slavePtr, *nextPtr; TkDisplay *dispPtr = ((TkWindow *) containerPtr->tkwin)->dispPtr; switch (eventPtr->type) { @@ -1164,7 +1164,7 @@ SlaveStructureProc( * referred to by eventPtr. */ XEvent *eventPtr) /* Describes what just happened. */ { - register Slave *slavePtr = clientData; + Slave *slavePtr = clientData; TkDisplay *dispPtr = ((TkWindow *) slavePtr->tkwin)->dispPtr; if (eventPtr->type == DestroyNotify) { @@ -1227,28 +1227,28 @@ PlaceRequestProc( /* *-------------------------------------------------------------- * - * PlaceLostSlaveProc -- + * PlaceLostContentProc -- * * This function is invoked by Tk whenever some other geometry claims - * control over a slave that used to be managed by us. + * control over a content window that used to be managed by us. * * Results: * None. * * Side effects: - * Forgets all placer-related information about the slave. + * Forgets all placer-related information about the content window. * *-------------------------------------------------------------- */ /* ARGSUSED */ static void -PlaceLostSlaveProc( +PlaceLostContentProc( ClientData clientData, /* Slave structure for slave window that was * stolen away. */ Tk_Window tkwin) /* Tk's handle for the slave window. */ { - register Slave *slavePtr = clientData; + Slave *slavePtr = clientData; TkDisplay *dispPtr = ((TkWindow *) slavePtr->tkwin)->dispPtr; if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) { diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c index dd9e0ea..a0e7089 100644 --- a/generic/tkTextWind.c +++ b/generic/tkTextWind.c @@ -22,13 +22,13 @@ static void EmbWinRequestProc(ClientData clientData, Tk_Window tkwin); -static void EmbWinLostSlaveProc(ClientData clientData, +static void EmbWinLostContentProc(ClientData clientData, Tk_Window tkwin); static const Tk_GeomMgr textGeomType = { "text", /* name */ EmbWinRequestProc, /* requestProc */ - EmbWinLostSlaveProc, /* lostSlaveProc */ + EmbWinLostContentProc, /* lostSlaveProc */ }; /* @@ -594,9 +594,9 @@ EmbWinRequestProc( /* *-------------------------------------------------------------- * - * EmbWinLostSlaveProc -- + * EmbWinLostContentProc -- * - * This function is invoked by the Tk geometry manager when a slave + * This function is invoked by the Tk geometry manager when a content * window managed by a text widget is claimed away by another geometry * manager. * @@ -611,7 +611,7 @@ EmbWinRequestProc( */ static void -EmbWinLostSlaveProc( +EmbWinLostContentProc( ClientData clientData, /* Pointer to record describing window item. */ Tk_Window tkwin) /* Window that was claimed away by another * geometry manager. */ diff --git a/generic/ttk/ttkBlink.c b/generic/ttk/ttkBlink.c index 706a871..a7d4a9a 100644 --- a/generic/ttk/ttkBlink.c +++ b/generic/ttk/ttkBlink.c @@ -14,7 +14,7 @@ * Add script-level access to configure application-wide blink rate. */ -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" @@ -57,7 +57,7 @@ static CursorManager *GetCursorManager(Tcl_Interp *interp) cm->owner = 0; cm->onTime = DEF_CURSOR_ON_TIME; cm->offTime = DEF_CURSOR_OFF_TIME; - Tcl_SetAssocData(interp,cm_key,CursorManagerDeleteProc,(ClientData)cm); + Tcl_SetAssocData(interp, cm_key, CursorManagerDeleteProc, cm); } return cm; } diff --git a/generic/ttk/ttkButton.c b/generic/ttk/ttkButton.c index 43855b2..f4ef7bc 100644 --- a/generic/ttk/ttkButton.c +++ b/generic/ttk/ttkButton.c @@ -4,8 +4,7 @@ * label, button, checkbutton, radiobutton, and menubutton widgets. */ -#include <string.h> -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" @@ -81,9 +80,9 @@ static Tk_OptionSpec BaseOptionSpecs[] = * Compound base/image options */ {TK_OPTION_STRING_TABLE, "-compound", "compound", "Compound", - NULL, Tk_Offset(Base,base.compoundObj), -1, - TK_OPTION_NULL_OK,(ClientData)ttkCompoundStrings, - GEOMETRY_CHANGED }, + NULL, Tk_Offset(Base,base.compoundObj), -1, + TK_OPTION_NULL_OK, (void *)ttkCompoundStrings, + GEOMETRY_CHANGED }, {TK_OPTION_STRING, "-padding", "padding", "Pad", NULL, Tk_Offset(Base,base.paddingObj), -1, TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED}, @@ -820,7 +819,7 @@ static Tk_OptionSpec MenubuttonOptionSpecs[] = "", Tk_Offset(Menubutton, menubutton.menuObj), -1, 0,0,0}, {TK_OPTION_STRING_TABLE, "-direction", "direction", "Direction", "below", Tk_Offset(Menubutton, menubutton.directionObj), -1, - 0,(ClientData)directionStrings,GEOMETRY_CHANGED}, + 0, (void *)directionStrings, GEOMETRY_CHANGED}, WIDGET_TAKEFOCUS_TRUE, WIDGET_INHERIT_OPTIONS(BaseOptionSpecs) diff --git a/generic/ttk/ttkCache.c b/generic/ttk/ttkCache.c index 0ae2372..e7f885f 100644 --- a/generic/ttk/ttkCache.c +++ b/generic/ttk/ttkCache.c @@ -29,7 +29,7 @@ */ #include <stdio.h> /* for sprintf */ -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" struct Ttk_ResourceCache_ { diff --git a/generic/ttk/ttkClamTheme.c b/generic/ttk/ttkClamTheme.c index 41a8f6d..733a391 100644 --- a/generic/ttk/ttkClamTheme.c +++ b/generic/ttk/ttkClamTheme.c @@ -4,7 +4,7 @@ * "clam" theme; inspired by the XFCE family of Gnome themes. */ -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" /* diff --git a/generic/ttk/ttkElements.c b/generic/ttk/ttkElements.c index 5c95dba..c4469dc 100644 --- a/generic/ttk/ttkElements.c +++ b/generic/ttk/ttkElements.c @@ -5,8 +5,7 @@ * */ -#include <tcl.h> -#include <tk.h> +#include "tkInt.h" #include <string.h> #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkFrame.c b/generic/ttk/ttkFrame.c index 8a15e5b..931c037 100644 --- a/generic/ttk/ttkFrame.c +++ b/generic/ttk/ttkFrame.c @@ -4,8 +4,7 @@ * ttk::frame and ttk::labelframe widgets. */ -#include <tk.h> - +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" #include "ttkManager.h" @@ -456,7 +455,7 @@ static void LabelframeDoLayout(void *recordPtr) Ttk_PlaceLayout( lframePtr->label.labelLayout, corePtr->state, labelParcel); } - /* labelWidget placed in LabelframePlaceSlaves GM hook */ + /* labelWidget placed in LabelframePlaceContent GM hook */ lframePtr->label.labelParcel = labelParcel; } @@ -472,23 +471,27 @@ static void LabelframeDisplay(void *recordPtr, Drawable d) /* +++ Labelframe geometry manager hooks. */ -/* LabelframePlaceSlaves -- +/* LabelframePlaceContent -- * Sets the position and size of the labelwidget. */ -static void LabelframePlaceSlaves(void *recordPtr) +static void LabelframePlaceContent(void *recordPtr) { Labelframe *lframe = recordPtr; - if (Ttk_NumberSlaves(lframe->label.mgr) == 1) { + if (Ttk_NumberContent(lframe->label.mgr) == 1) { Ttk_Box b; LabelframeDoLayout(recordPtr); b = lframe->label.labelParcel; /* ASSERT: slave #0 is lframe->label.labelWidget */ - Ttk_PlaceSlave(lframe->label.mgr, 0, b.x,b.y,b.width,b.height); + Ttk_PlaceContent(lframe->label.mgr, 0, b.x,b.y,b.width,b.height); } } -static int LabelRequest(void *managerData, int index, int width, int height) +static int LabelRequest( + void *managerData, + int index, + int width, + int height) { return 1; } @@ -500,16 +503,18 @@ static int LabelRequest(void *managerData, int index, int width, int height) * This routine is also called when the widget voluntarily forgets * the slave in LabelframeConfigure. */ -static void LabelRemoved(void *managerData, int slaveIndex) +static void LabelRemoved( + void *managerData, + TCL_UNUSED(int)) { Labelframe *lframe = managerData; lframe->label.labelWidget = 0; } static Ttk_ManagerSpec LabelframeManagerSpec = { - { "labelframe", Ttk_GeometryRequestProc, Ttk_LostSlaveProc }, + { "labelframe", Ttk_GeometryRequestProc, Ttk_LostContentProc }, LabelframeSize, - LabelframePlaceSlaves, + LabelframePlaceContent, LabelRequest, LabelRemoved }; @@ -591,15 +596,15 @@ static int LabelframeConfigure(Tcl_Interp *interp,void *recordPtr,int mask) /* Update -labelwidget changes, if any: */ if (mask & LABELWIDGET_CHANGED) { - if (Ttk_NumberSlaves(lframePtr->label.mgr) == 1) { - Ttk_ForgetSlave(lframePtr->label.mgr, 0); + if (Ttk_NumberContent(lframePtr->label.mgr) == 1) { + Ttk_ForgetContent(lframePtr->label.mgr, 0); /* Restore labelWidget field (see <<NOTE-LABELREMOVED>>) */ lframePtr->label.labelWidget = labelWidget; } if (labelWidget) { - Ttk_InsertSlave(lframePtr->label.mgr, 0, labelWidget, NULL); + Ttk_InsertContent(lframePtr->label.mgr, 0, labelWidget, NULL); RaiseLabelWidget(lframePtr); } } diff --git a/generic/ttk/ttkImage.c b/generic/ttk/ttkImage.c index e403e2d..5c2a55f 100644 --- a/generic/ttk/ttkImage.c +++ b/generic/ttk/ttkImage.c @@ -11,7 +11,7 @@ */ #include <string.h> -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #define MIN(a,b) ((a) < (b) ? (a) : (b)) diff --git a/generic/ttk/ttkInit.c b/generic/ttk/ttkInit.c index 01a393a..f1b6e26 100644 --- a/generic/ttk/ttkInit.c +++ b/generic/ttk/ttkInit.c @@ -5,7 +5,7 @@ */ #include <string.h> -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" @@ -275,7 +275,7 @@ Ttk_Init(Tcl_Interp *interp) Ttk_PlatformInit(interp); - Tcl_PkgProvideEx(interp, "Ttk", TTK_PATCH_LEVEL, (ClientData)&ttkStubs); + Tcl_PkgProvideEx(interp, "Ttk", TTK_PATCH_LEVEL, (void *)&ttkStubs); return TCL_OK; } diff --git a/generic/ttk/ttkManager.c b/generic/ttk/ttkManager.c index 3621186..8fa7860 100644 --- a/generic/ttk/ttkManager.c +++ b/generic/ttk/ttkManager.c @@ -5,7 +5,7 @@ */ #include <string.h> -#include <tk.h> +#include "tkInt.h" #include "ttkManager.h" /*------------------------------------------------------------------------ @@ -27,13 +27,13 @@ * we also schedule an idle handler to call the layout procedure * after making a geometry request. * - * +++ Slave removal <<NOTE-LOSTSLAVE>>. + * +++ Content window removal <<NOTE-LOSTCONTENT>>. * - * There are three conditions under which a slave is removed: + * There are three conditions under which a content window is removed: * * (1) Another GM claims control * (2) Manager voluntarily relinquishes control - * (3) Slave is destroyed + * (3) Content window is destroyed * * In case (1), Tk calls the manager's lostSlaveProc. * Case (2) is performed by calling Tk_ManageGeometry(slave,NULL,0); @@ -46,15 +46,15 @@ */ typedef struct { - Tk_Window slaveWindow; + Tk_Window contentWindow; Ttk_Manager *manager; - void *slaveData; + void *data; unsigned flags; -} Ttk_Slave; +} Ttk_Content; /* slave->flags bits: */ -#define SLAVE_MAPPED 0x1 /* slave to be mapped when container is */ +#define CONTENT_MAPPED 0x1 /* content windows to be mapped when container is */ struct TtkManager_ { @@ -62,8 +62,8 @@ struct TtkManager_ void *managerData; Tk_Window containerWindow; unsigned flags; - int nSlaves; - Ttk_Slave **slaves; + int nContent; + Ttk_Content **content; }; /* manager->flags bits: @@ -151,33 +151,33 @@ static void ManagerEventHandler(ClientData clientData, XEvent *eventPtr) RecomputeLayout(mgr); break; case MapNotify: - for (i = 0; i < mgr->nSlaves; ++i) { - Ttk_Slave *slave = mgr->slaves[i]; - if (slave->flags & SLAVE_MAPPED) { - Tk_MapWindow(slave->slaveWindow); + for (i = 0; i < mgr->nContent; ++i) { + Ttk_Content *slave = mgr->content[i]; + if (slave->flags & CONTENT_MAPPED) { + Tk_MapWindow(slave->contentWindow); } } break; case UnmapNotify: - for (i = 0; i < mgr->nSlaves; ++i) { - Ttk_Slave *slave = mgr->slaves[i]; - Tk_UnmapWindow(slave->slaveWindow); + for (i = 0; i < mgr->nContent; ++i) { + Ttk_Content *slave = mgr->content[i]; + Tk_UnmapWindow(slave->contentWindow); } break; } } -/* ++ SlaveEventHandler -- +/* ++ LostContentEventHandler -- * Notifies manager when a slave is destroyed - * (see <<NOTE-LOSTSLAVE>>). + * (see <<NOTE-LOSTCONTENT>>). */ static const unsigned SlaveEventMask = StructureNotifyMask; -static void SlaveEventHandler(ClientData clientData, XEvent *eventPtr) +static void LostContentEventHandler(ClientData clientData, XEvent *eventPtr) { - Ttk_Slave *slave = (Ttk_Slave *)clientData; + Ttk_Content *slave = (Ttk_Content *)clientData; if (eventPtr->type == DestroyNotify) { slave->manager->managerSpec->tkGeomMgr.lostSlaveProc( - slave->manager, slave->slaveWindow); + slave->manager, slave->contentWindow); } } @@ -185,22 +185,22 @@ static void SlaveEventHandler(ClientData clientData, XEvent *eventPtr) * +++ Slave initialization and cleanup. */ -static Ttk_Slave *NewSlave( - Ttk_Manager *mgr, Tk_Window slaveWindow, void *slaveData) +static Ttk_Content *NewContent( + Ttk_Manager *mgr, Tk_Window contentWindow, void *data) { - Ttk_Slave *slave = (Ttk_Slave *)ckalloc(sizeof(*slave)); + Ttk_Content *content = (Ttk_Content *)ckalloc(sizeof(Ttk_Content)); - slave->slaveWindow = slaveWindow; - slave->manager = mgr; - slave->flags = 0; - slave->slaveData = slaveData; + content->contentWindow = contentWindow; + content->manager = mgr; + content->flags = 0; + content->data = data; - return slave; + return content; } -static void DeleteSlave(Ttk_Slave *slave) +static void DeleteSlave(Ttk_Content *content) { - ckfree(slave); + ckfree(content); } /*------------------------------------------------------------------------ @@ -215,8 +215,8 @@ Ttk_Manager *Ttk_CreateManager( mgr->managerSpec = managerSpec; mgr->managerData = managerData; mgr->containerWindow = containerWindow; - mgr->nSlaves = 0; - mgr->slaves = NULL; + mgr->nContent = 0; + mgr->content = NULL; mgr->flags = 0; Tk_CreateEventHandler( @@ -230,11 +230,11 @@ void Ttk_DeleteManager(Ttk_Manager *mgr) Tk_DeleteEventHandler( mgr->containerWindow, ManagerEventMask, ManagerEventHandler, mgr); - while (mgr->nSlaves > 0) { - Ttk_ForgetSlave(mgr, mgr->nSlaves - 1); + while (mgr->nContent > 0) { + Ttk_ForgetContent(mgr, mgr->nContent - 1); } - if (mgr->slaves) { - ckfree(mgr->slaves); + if (mgr->content) { + ckfree(mgr->content); } Tcl_CancelIdleCall(ManagerIdleProc, mgr); @@ -246,26 +246,26 @@ void Ttk_DeleteManager(Ttk_Manager *mgr) * +++ Slave management. */ -/* ++ InsertSlave -- - * Adds slave to the list of managed windows. +/* ++ InsertContent -- + * Adds content to the list of managed windows. */ -static void InsertSlave(Ttk_Manager *mgr, Ttk_Slave *slave, int index) +static void InsertContent(Ttk_Manager *mgr, Ttk_Content *content, int index) { - int endIndex = mgr->nSlaves++; - mgr->slaves = (Ttk_Slave **)ckrealloc(mgr->slaves, mgr->nSlaves * sizeof(Ttk_Slave *)); + int endIndex = mgr->nContent++; + mgr->content = (Ttk_Content **)ckrealloc(mgr->content, mgr->nContent * sizeof(Ttk_Content *)); while (endIndex > index) { - mgr->slaves[endIndex] = mgr->slaves[endIndex - 1]; + mgr->content[endIndex] = mgr->content[endIndex - 1]; --endIndex; } - mgr->slaves[index] = slave; + mgr->content[index] = content; - Tk_ManageGeometry(slave->slaveWindow, - &mgr->managerSpec->tkGeomMgr, (ClientData)mgr); + Tk_ManageGeometry(content->contentWindow, + &mgr->managerSpec->tkGeomMgr, mgr); - Tk_CreateEventHandler(slave->slaveWindow, - SlaveEventMask, SlaveEventHandler, (ClientData)slave); + Tk_CreateEventHandler(content->contentWindow, + SlaveEventMask, LostContentEventHandler, content); ScheduleUpdate(mgr, MGR_RESIZE_REQUIRED); } @@ -280,7 +280,7 @@ static void InsertSlave(Ttk_Manager *mgr, Ttk_Slave *slave, int index) */ static void RemoveSlave(Ttk_Manager *mgr, int index) { - Ttk_Slave *slave = mgr->slaves[index]; + Ttk_Content *slave = mgr->content[index]; int i; /* Notify manager: @@ -289,19 +289,19 @@ static void RemoveSlave(Ttk_Manager *mgr, int index) /* Remove from array: */ - --mgr->nSlaves; - for (i = index ; i < mgr->nSlaves; ++i) { - mgr->slaves[i] = mgr->slaves[i+1]; + --mgr->nContent; + for (i = index ; i < mgr->nContent; ++i) { + mgr->content[i] = mgr->content[i+1]; } /* Clean up: */ Tk_DeleteEventHandler( - slave->slaveWindow, SlaveEventMask, SlaveEventHandler, slave); + slave->contentWindow, SlaveEventMask, LostContentEventHandler, slave); /* Note [1] */ - Tk_UnmaintainGeometry(slave->slaveWindow, mgr->containerWindow); - Tk_UnmapWindow(slave->slaveWindow); + Tk_UnmaintainGeometry(slave->contentWindow, mgr->containerWindow); + Tk_UnmapWindow(slave->contentWindow); DeleteSlave(slave); @@ -312,24 +312,24 @@ static void RemoveSlave(Ttk_Manager *mgr, int index) * +++ Tk_GeomMgr hooks. */ -void Ttk_GeometryRequestProc(ClientData clientData, Tk_Window slaveWindow) +void Ttk_GeometryRequestProc(ClientData clientData, Tk_Window contentWindow) { Ttk_Manager *mgr = (Ttk_Manager *)clientData; - int slaveIndex = Ttk_SlaveIndex(mgr, slaveWindow); - int reqWidth = Tk_ReqWidth(slaveWindow); - int reqHeight= Tk_ReqHeight(slaveWindow); + int index = Ttk_ContentIndex(mgr, contentWindow); + int reqWidth = Tk_ReqWidth(contentWindow); + int reqHeight= Tk_ReqHeight(contentWindow); if (mgr->managerSpec->SlaveRequest( - mgr->managerData, slaveIndex, reqWidth, reqHeight)) + mgr->managerData, index, reqWidth, reqHeight)) { ScheduleUpdate(mgr, MGR_RESIZE_REQUIRED); } } -void Ttk_LostSlaveProc(ClientData clientData, Tk_Window slaveWindow) +void Ttk_LostContentProc(ClientData clientData, Tk_Window contentWindow) { Ttk_Manager *mgr = (Ttk_Manager *)clientData; - int index = Ttk_SlaveIndex(mgr, slaveWindow); + int index = Ttk_ContentIndex(mgr, contentWindow); /* ASSERT: index >= 0 */ RemoveSlave(mgr, index); @@ -339,56 +339,56 @@ void Ttk_LostSlaveProc(ClientData clientData, Tk_Window slaveWindow) * +++ Public API. */ -/* ++ Ttk_InsertSlave -- - * Add a new slave window at the specified index. +/* ++ Ttk_InsertContent -- + * Add a new content window at the specified index. */ -void Ttk_InsertSlave( - Ttk_Manager *mgr, int index, Tk_Window tkwin, void *slaveData) +void Ttk_InsertContent( + Ttk_Manager *mgr, int index, Tk_Window tkwin, void *data) { - Ttk_Slave *slave = NewSlave(mgr, tkwin, slaveData); - InsertSlave(mgr, slave, index); + Ttk_Content *slave = NewContent(mgr, tkwin, data); + InsertContent(mgr, slave, index); } -/* ++ Ttk_ForgetSlave -- - * Unmanage the specified slave. +/* ++ Ttk_ForgetContent -- + * Unmanage the specified content window. */ -void Ttk_ForgetSlave(Ttk_Manager *mgr, int slaveIndex) +void Ttk_ForgetContent(Ttk_Manager *mgr, int index) { - Tk_Window slaveWindow = mgr->slaves[slaveIndex]->slaveWindow; - RemoveSlave(mgr, slaveIndex); - Tk_ManageGeometry(slaveWindow, NULL, 0); + Tk_Window contentWindow = mgr->content[index]->contentWindow; + RemoveSlave(mgr, index); + Tk_ManageGeometry(contentWindow, NULL, 0); } -/* ++ Ttk_PlaceSlave -- - * Set the position and size of the specified slave window. +/* ++ Ttk_PlaceContent -- + * Set the position and size of the specified content window. * * NOTES: * Contrary to documentation, Tk_MaintainGeometry doesn't always - * map the slave. + * map the content window. */ -void Ttk_PlaceSlave( - Ttk_Manager *mgr, int slaveIndex, int x, int y, int width, int height) +void Ttk_PlaceContent( + Ttk_Manager *mgr, int index, int x, int y, int width, int height) { - Ttk_Slave *slave = mgr->slaves[slaveIndex]; - Tk_MaintainGeometry(slave->slaveWindow,mgr->containerWindow,x,y,width,height); - slave->flags |= SLAVE_MAPPED; + Ttk_Content *slave = mgr->content[index]; + Tk_MaintainGeometry(slave->contentWindow,mgr->containerWindow,x,y,width,height); + slave->flags |= CONTENT_MAPPED; if (Tk_IsMapped(mgr->containerWindow)) { - Tk_MapWindow(slave->slaveWindow); + Tk_MapWindow(slave->contentWindow); } } -/* ++ Ttk_UnmapSlave -- - * Unmap the specified slave, but leave it managed. +/* ++ Ttk_UnmapContent -- + * Unmap the specified content window, but leave it managed. */ -void Ttk_UnmapSlave(Ttk_Manager *mgr, int slaveIndex) +void Ttk_UnmapContent(Ttk_Manager *mgr, int index) { - Ttk_Slave *slave = mgr->slaves[slaveIndex]; - Tk_UnmaintainGeometry(slave->slaveWindow, mgr->containerWindow); - slave->flags &= ~SLAVE_MAPPED; + Ttk_Content *slave = mgr->content[index]; + Tk_UnmaintainGeometry(slave->contentWindow, mgr->containerWindow); + slave->flags &= ~CONTENT_MAPPED; /* Contrary to documentation, Tk_UnmaintainGeometry doesn't always - * unmap the slave: + * unmap the content window: */ - Tk_UnmapWindow(slave->slaveWindow); + Tk_UnmapWindow(slave->contentWindow); } /* LayoutChanged, SizeChanged -- @@ -406,61 +406,61 @@ void Ttk_ManagerSizeChanged(Ttk_Manager *mgr) /* +++ Accessors. */ -int Ttk_NumberSlaves(Ttk_Manager *mgr) +int Ttk_NumberContent(Ttk_Manager *mgr) { - return mgr->nSlaves; + return mgr->nContent; } -void *Ttk_SlaveData(Ttk_Manager *mgr, int slaveIndex) +void *Ttk_ContentData(Ttk_Manager *mgr, int index) { - return mgr->slaves[slaveIndex]->slaveData; + return mgr->content[index]->data; } -Tk_Window Ttk_SlaveWindow(Ttk_Manager *mgr, int slaveIndex) +Tk_Window Ttk_ContentWindow(Ttk_Manager *mgr, int index) { - return mgr->slaves[slaveIndex]->slaveWindow; + return mgr->content[index]->contentWindow; } /*------------------------------------------------------------------------ * +++ Utility routines. */ -/* ++ Ttk_SlaveIndex -- - * Returns the index of specified slave window, -1 if not found. +/* ++ Ttk_ContentIndex -- + * Returns the index of specified content window, -1 if not found. */ -int Ttk_SlaveIndex(Ttk_Manager *mgr, Tk_Window slaveWindow) +int Ttk_ContentIndex(Ttk_Manager *mgr, Tk_Window contentWindow) { int index; - for (index = 0; index < mgr->nSlaves; ++index) - if (mgr->slaves[index]->slaveWindow == slaveWindow) + for (index = 0; index < mgr->nContent; ++index) + if (mgr->content[index]->contentWindow == contentWindow) return index; return -1; } -/* ++ Ttk_GetSlaveIndexFromObj(interp, mgr, objPtr, indexPtr) -- - * Return the index of the slave specified by objPtr. - * Slaves may be specified as an integer index or +/* ++ Ttk_GetContentIndexFromObj(interp, mgr, objPtr, indexPtr) -- + * Return the index of the content window specified by objPtr. + * Content windows may be specified as an integer index or * as the name of the managed window. * * Returns: * Standard Tcl completion code. Leaves an error message in case of error. */ -int Ttk_GetSlaveIndexFromObj( +int Ttk_GetContentIndexFromObj( Tcl_Interp *interp, Ttk_Manager *mgr, Tcl_Obj *objPtr, int *indexPtr) { const char *string = Tcl_GetString(objPtr); - int slaveIndex = 0; + int index = 0; Tk_Window tkwin; /* Try interpreting as an integer first: */ - if (Tcl_GetIntFromObj(NULL, objPtr, &slaveIndex) == TCL_OK) { - if (slaveIndex < 0 || slaveIndex >= mgr->nSlaves) { + if (Tcl_GetIntFromObj(NULL, objPtr, &index) == TCL_OK) { + if (index < 0 || index >= mgr->nContent) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "Slave index %d out of bounds", slaveIndex)); + "Slave index %d out of bounds", index)); Tcl_SetErrorCode(interp, "TTK", "SLAVE", "INDEX", NULL); return TCL_ERROR; } - *indexPtr = slaveIndex; + *indexPtr = index; return TCL_OK; } @@ -468,15 +468,15 @@ int Ttk_GetSlaveIndexFromObj( */ if ((*string == '.') && (tkwin = Tk_NameToWindow(interp, string, mgr->containerWindow))) { - slaveIndex = Ttk_SlaveIndex(mgr, tkwin); - if (slaveIndex < 0) { + index = Ttk_ContentIndex(mgr, tkwin); + if (index < 0) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "%s is not managed by %s", string, Tk_PathName(mgr->containerWindow))); Tcl_SetErrorCode(interp, "TTK", "SLAVE", "MANAGER", NULL); return TCL_ERROR; } - *indexPtr = slaveIndex; + *indexPtr = index; return TCL_OK; } @@ -486,25 +486,25 @@ int Ttk_GetSlaveIndexFromObj( return TCL_ERROR; } -/* ++ Ttk_ReorderSlave(mgr, fromIndex, toIndex) -- - * Change slave order. +/* ++ Ttk_ReorderContent(mgr, fromIndex, toIndex) -- + * Change content window order. */ -void Ttk_ReorderSlave(Ttk_Manager *mgr, int fromIndex, int toIndex) +void Ttk_ReorderContent(Ttk_Manager *mgr, int fromIndex, int toIndex) { - Ttk_Slave *moved = mgr->slaves[fromIndex]; + Ttk_Content *moved = mgr->content[fromIndex]; /* Shuffle down: */ while (fromIndex > toIndex) { - mgr->slaves[fromIndex] = mgr->slaves[fromIndex - 1]; + mgr->content[fromIndex] = mgr->content[fromIndex - 1]; --fromIndex; } /* Or, shuffle up: */ while (fromIndex < toIndex) { - mgr->slaves[fromIndex] = mgr->slaves[fromIndex + 1]; + mgr->content[fromIndex] = mgr->content[fromIndex + 1]; ++fromIndex; } /* ASSERT: fromIndex == toIndex */ - mgr->slaves[fromIndex] = moved; + mgr->content[fromIndex] = moved; /* Schedule a relayout. In general, rearranging slaves * may also change the size: diff --git a/generic/ttk/ttkManager.h b/generic/ttk/ttkManager.h index 0a66ada..c4c46ed 100644 --- a/generic/ttk/ttkManager.h +++ b/generic/ttk/ttkManager.h @@ -17,7 +17,7 @@ typedef struct TtkManager_ Ttk_Manager; * RequestedSize computes the requested size of the container window. * * PlaceSlaves sets the position and size of all managed slaves - * by calling Ttk_PlaceSlave(). + * by calling Ttk_PlaceContent(). * * SlaveRemoved() is called immediately before a slave is removed. * NB: the associated slave window may have been destroyed when this @@ -31,15 +31,16 @@ typedef struct { /* Manager hooks */ int (*RequestedSize)(void *managerData, int *widthPtr, int *heightPtr); void (*PlaceSlaves)(void *managerData); - int (*SlaveRequest)(void *managerData, int slaveIndex, int w, int h); - void (*SlaveRemoved)(void *managerData, int slaveIndex); + int (*SlaveRequest)(void *managerData, int index, int w, int h); + void (*SlaveRemoved)(void *managerData, int index); } Ttk_ManagerSpec; /* * Default implementations for Tk_GeomMgr hooks: */ +#define Ttk_LostContentProc Ttk_LostSlaveProc MODULE_SCOPE void Ttk_GeometryRequestProc(ClientData, Tk_Window slave); -MODULE_SCOPE void Ttk_LostSlaveProc(ClientData, Tk_Window slave); +MODULE_SCOPE void Ttk_LostContentProc(ClientData, Tk_Window slave); /* * Public API: @@ -48,20 +49,25 @@ MODULE_SCOPE Ttk_Manager *Ttk_CreateManager( Ttk_ManagerSpec *, void *managerData, Tk_Window window); MODULE_SCOPE void Ttk_DeleteManager(Ttk_Manager *); -MODULE_SCOPE void Ttk_InsertSlave( - Ttk_Manager *, int position, Tk_Window, void *slaveData); +#define Ttk_InsertContent Ttk_InsertSlave +MODULE_SCOPE void Ttk_InsertContent( + Ttk_Manager *, int position, Tk_Window, void *data); -MODULE_SCOPE void Ttk_ForgetSlave(Ttk_Manager *, int slaveIndex); +#define Ttk_ForgetContent Ttk_ForgetSlave +MODULE_SCOPE void Ttk_ForgetContent(Ttk_Manager *, int index); -MODULE_SCOPE void Ttk_ReorderSlave(Ttk_Manager *, int fromIndex, int toIndex); - /* Rearrange slave positions */ +#define Ttk_ReorderContent Ttk_ReorderSlave +MODULE_SCOPE void Ttk_ReorderContent(Ttk_Manager *, int fromIndex, int toIndex); + /* Rearrange content window positions */ -MODULE_SCOPE void Ttk_PlaceSlave( - Ttk_Manager *, int slaveIndex, int x, int y, int width, int height); - /* Position and map the slave */ +#define Ttk_PlaceContent Ttk_PlaceSlave +MODULE_SCOPE void Ttk_PlaceContent( + Ttk_Manager *, int index, int x, int y, int width, int height); + /* Position and map the content window */ -MODULE_SCOPE void Ttk_UnmapSlave(Ttk_Manager *, int slaveIndex); - /* Unmap the slave */ +#define Ttk_UnmapContent Ttk_UnmapSlave +MODULE_SCOPE void Ttk_UnmapContent(Ttk_Manager *, int index); + /* Unmap the content window */ MODULE_SCOPE void Ttk_ManagerSizeChanged(Ttk_Manager *); MODULE_SCOPE void Ttk_ManagerLayoutChanged(Ttk_Manager *); @@ -69,22 +75,27 @@ MODULE_SCOPE void Ttk_ManagerLayoutChanged(Ttk_Manager *); /* Utilities: */ -MODULE_SCOPE int Ttk_SlaveIndex(Ttk_Manager *, Tk_Window); +#define Ttk_ContentIndex Ttk_SlaveIndex +MODULE_SCOPE int Ttk_ContentIndex(Ttk_Manager *, Tk_Window); /* Returns: index in slave array of specified window, -1 if not found */ -MODULE_SCOPE int Ttk_GetSlaveIndexFromObj( +#define Ttk_GetContentIndexFromObj Ttk_GetSlaveIndexFromObj +MODULE_SCOPE int Ttk_GetContentIndexFromObj( Tcl_Interp *, Ttk_Manager *, Tcl_Obj *, int *indexPtr); /* Accessor functions: */ -MODULE_SCOPE int Ttk_NumberSlaves(Ttk_Manager *); - /* Returns: number of managed slaves */ +#define Ttk_NumberContent Ttk_NumberSlaves +MODULE_SCOPE int Ttk_NumberContent(Ttk_Manager *); + /* Returns: number of managed content windows */ -MODULE_SCOPE void *Ttk_SlaveData(Ttk_Manager *, int slaveIndex); - /* Returns: client data associated with slave */ +#define Ttk_ContentData Ttk_SlaveData +MODULE_SCOPE void *Ttk_ContentData(Ttk_Manager *, int index); + /* Returns: client data associated with content window */ -MODULE_SCOPE Tk_Window Ttk_SlaveWindow(Ttk_Manager *, int slaveIndex); - /* Returns: slave window */ +#define Ttk_ContentWindow Ttk_SlaveWindow +MODULE_SCOPE Tk_Window Ttk_ContentWindow(Ttk_Manager *, int index); + /* Returns: content window */ MODULE_SCOPE int Ttk_Maintainable(Tcl_Interp *, Tk_Window content, Tk_Window container); /* Returns: 1 if container can manage content; 0 otherwise leaving error msg */ diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c index 39ed6aa..d94b4ed 100644 --- a/generic/ttk/ttkNotebook.c +++ b/generic/ttk/ttkNotebook.c @@ -5,7 +5,7 @@ #include <string.h> #include <ctype.h> #include <stdio.h> -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" @@ -63,14 +63,14 @@ static Tk_OptionSpec TabOptionSpecs[] = { {TK_OPTION_STRING_TABLE, "-state", "", "", "normal", -1,Tk_Offset(Tab,state), - 0,(ClientData)TabStateStrings,0 }, + 0, (void *)TabStateStrings, 0 }, {TK_OPTION_STRING, "-text", "text", "Text", "", Tk_Offset(Tab,textObj), -1, 0,0,GEOMETRY_CHANGED }, {TK_OPTION_STRING, "-image", "image", "Image", NULL/*default*/, Tk_Offset(Tab,imageObj), -1, TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED }, {TK_OPTION_STRING_TABLE, "-compound", "compound", "Compound", NULL, Tk_Offset(Tab,compoundObj), -1, - TK_OPTION_NULL_OK,(ClientData)ttkCompoundStrings,GEOMETRY_CHANGED }, + TK_OPTION_NULL_OK, (void *)ttkCompoundStrings, GEOMETRY_CHANGED }, {TK_OPTION_INT, "-underline", "underline", "Underline", "-1", Tk_Offset(Tab,underlineObj), -1, 0,0,GEOMETRY_CHANGED }, {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0 } @@ -221,7 +221,7 @@ static int ConfigureTab( Tk_SavedOptions savedOptions; int mask = 0; - if (Tk_SetOptions(interp, (ClientData)tab, nb->notebook.paneOptionTable, + if (Tk_SetOptions(interp, (void *)tab, nb->notebook.paneOptionTable, objc, objv, slaveWindow, &savedOptions, &mask) != TCL_OK) { return TCL_ERROR; @@ -261,8 +261,8 @@ error: static int IdentifyTab(Notebook *nb, int x, int y) { int index; - for (index = 0; index < Ttk_NumberSlaves(nb->notebook.mgr); ++index) { - Tab *tab = Ttk_SlaveData(nb->notebook.mgr,index); + for (index = 0; index < Ttk_NumberContent(nb->notebook.mgr); ++index) { + Tab *tab = Ttk_ContentData(nb->notebook.mgr,index); if ( tab->state != TAB_STATE_HIDDEN && Ttk_BoxContains(tab->parcel, x,y)) { @@ -294,7 +294,7 @@ static void ActivateTab(Notebook *nb, int index) static Ttk_State TabState(Notebook *nb, int index) { Ttk_State state = nb->core.state; - Tab *tab = Ttk_SlaveData(nb->notebook.mgr, index); + Tab *tab = Ttk_ContentData(nb->notebook.mgr, index); int i = 0; if (index == nb->notebook.currentIndex) { @@ -306,8 +306,8 @@ static Ttk_State TabState(Notebook *nb, int index) if (index == nb->notebook.activeIndex) { state |= TTK_STATE_ACTIVE; } - for (i = 0; i < Ttk_NumberSlaves(nb->notebook.mgr); ++i) { - Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i); + for (i = 0; i < Ttk_NumberContent(nb->notebook.mgr); ++i) { + Tab *tab = Ttk_ContentData(nb->notebook.mgr, i); if (tab->state == TAB_STATE_HIDDEN) { continue; } @@ -316,8 +316,8 @@ static Ttk_State TabState(Notebook *nb, int index) } break; } - for (i = Ttk_NumberSlaves(nb->notebook.mgr) - 1; i >= 0; --i) { - Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i); + for (i = Ttk_NumberContent(nb->notebook.mgr) - 1; i >= 0; --i) { + Tab *tab = Ttk_ContentData(nb->notebook.mgr, i); if (tab->state == TAB_STATE_HIDDEN) { continue; } @@ -357,8 +357,8 @@ static void TabrowSize( int tabrowWidth = 0, tabrowHeight = 0; int i; - for (i = 0; i < Ttk_NumberSlaves(nb->notebook.mgr); ++i) { - Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i); + for (i = 0; i < Ttk_NumberContent(nb->notebook.mgr); ++i) { + Tab *tab = Ttk_ContentData(nb->notebook.mgr, i); Ttk_State tabState = TabState(nb,i); Ttk_RebindSublayout(tabLayout, tab); @@ -401,9 +401,9 @@ static int NotebookSize(void *clientData, int *widthPtr, int *heightPtr) /* Compute max requested size of all slaves: */ - for (i = 0; i < Ttk_NumberSlaves(nb->notebook.mgr); ++i) { - Tk_Window slaveWindow = Ttk_SlaveWindow(nb->notebook.mgr, i); - Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i); + for (i = 0; i < Ttk_NumberContent(nb->notebook.mgr); ++i) { + Tk_Window slaveWindow = Ttk_ContentWindow(nb->notebook.mgr, i); + Tab *tab = Ttk_ContentData(nb->notebook.mgr, i); int slaveWidth = Tk_ReqWidth(slaveWindow) + Ttk_PaddingWidth(tab->padding); int slaveHeight @@ -465,7 +465,7 @@ static int NotebookSize(void *clientData, int *widthPtr, int *heightPtr) static void SqueezeTabs( Notebook *nb, int needed, int available) { - int nTabs = Ttk_NumberSlaves(nb->notebook.mgr); + int nTabs = Ttk_NumberContent(nb->notebook.mgr); if (nTabs > 0) { int difference = available - needed; @@ -474,7 +474,7 @@ static void SqueezeTabs( int i; for (i = 0; i < nTabs; ++i) { - Tab *tab = Ttk_SlaveData(nb->notebook.mgr,i); + Tab *tab = Ttk_ContentData(nb->notebook.mgr,i); double ad = slack + tab->width * delta; tab->width += (int)ad; slack = ad - (int)ad; @@ -489,11 +489,11 @@ static void PlaceTabs( Notebook *nb, Ttk_Box tabrowBox, Ttk_PositionSpec tabPlacement) { Ttk_Layout tabLayout = nb->notebook.tabLayout; - int nTabs = Ttk_NumberSlaves(nb->notebook.mgr); + int nTabs = Ttk_NumberContent(nb->notebook.mgr); int i; for (i = 0; i < nTabs; ++i) { - Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i); + Tab *tab = Ttk_ContentData(nb->notebook.mgr, i); Ttk_State tabState = TabState(nb, i); if (tab->state != TAB_STATE_HIDDEN) { @@ -571,32 +571,32 @@ static void NotebookDoLayout(void *recordPtr) } /* - * NotebookPlaceSlave -- + * NotebookPlaceContent -- * Set the position and size of a child widget - * based on the current client area and slave options: + * based on the current client area and content window options: */ -static void NotebookPlaceSlave(Notebook *nb, int slaveIndex) +static void NotebookPlaceContent(Notebook *nb, int index) { - Tab *tab = Ttk_SlaveData(nb->notebook.mgr, slaveIndex); - Tk_Window slaveWindow = Ttk_SlaveWindow(nb->notebook.mgr, slaveIndex); + Tab *tab = Ttk_ContentData(nb->notebook.mgr, index); + Tk_Window slaveWindow = Ttk_ContentWindow(nb->notebook.mgr, index); Ttk_Box slaveBox = Ttk_StickBox(Ttk_PadBox(nb->notebook.clientArea, tab->padding), Tk_ReqWidth(slaveWindow), Tk_ReqHeight(slaveWindow),tab->sticky); - Ttk_PlaceSlave(nb->notebook.mgr, slaveIndex, + Ttk_PlaceContent(nb->notebook.mgr, index, slaveBox.x, slaveBox.y, slaveBox.width, slaveBox.height); } -/* NotebookPlaceSlaves -- +/* NotebookPlaceContents -- * Geometry manager hook. */ -static void NotebookPlaceSlaves(void *recordPtr) +static void NotebookPlaceContents(void *recordPtr) { Notebook *nb = recordPtr; int currentIndex = nb->notebook.currentIndex; if (currentIndex >= 0) { NotebookDoLayout(nb); - NotebookPlaceSlave(nb, currentIndex); + NotebookPlaceContent(nb, currentIndex); } } @@ -606,7 +606,7 @@ static void NotebookPlaceSlaves(void *recordPtr) */ static void SelectTab(Notebook *nb, int index) { - Tab *tab = Ttk_SlaveData(nb->notebook.mgr,index); + Tab *tab = Ttk_ContentData(nb->notebook.mgr,index); int currentIndex = nb->notebook.currentIndex; if (index == currentIndex) { @@ -624,15 +624,15 @@ static void SelectTab(Notebook *nb, int index) } if (currentIndex >= 0) { - Ttk_UnmapSlave(nb->notebook.mgr, currentIndex); + Ttk_UnmapContent(nb->notebook.mgr, currentIndex); } - /* Must be set before calling NotebookPlaceSlave(), otherwise it may - * happen that NotebookPlaceSlaves(), triggered by an interveaning + /* Must be set before calling NotebookPlaceContent(), otherwise it may + * happen that NotebookPlaceContents(), triggered by an interveaning * geometry request, will swap to old index. */ nb->notebook.currentIndex = index; - NotebookPlaceSlave(nb, index); + NotebookPlaceContent(nb, index); TtkRedisplayWidget(&nb->core); TtkSendVirtualEvent(nb->core.tkwin, "NotebookTabChanged"); @@ -645,13 +645,13 @@ static void SelectTab(Notebook *nb, int index) */ static int NextTab(Notebook *nb, int index) { - int nTabs = Ttk_NumberSlaves(nb->notebook.mgr); + int nTabs = Ttk_NumberContent(nb->notebook.mgr); int nextIndex; /* Scan forward for following usable tab: */ for (nextIndex = index + 1; nextIndex < nTabs; ++nextIndex) { - Tab *tab = Ttk_SlaveData(nb->notebook.mgr, nextIndex); + Tab *tab = Ttk_ContentData(nb->notebook.mgr, nextIndex); if (tab->state == TAB_STATE_NORMAL) { return nextIndex; } @@ -660,7 +660,7 @@ static int NextTab(Notebook *nb, int index) /* Not found -- scan backwards. */ for (nextIndex = index - 1; nextIndex >= 0; --nextIndex) { - Tab *tab = Ttk_SlaveData(nb->notebook.mgr, nextIndex); + Tab *tab = Ttk_ContentData(nb->notebook.mgr, nextIndex); if (tab->state == TAB_STATE_NORMAL) { return nextIndex; } @@ -684,7 +684,7 @@ static void SelectNearestTab(Notebook *nb) int nextIndex = NextTab(nb, currentIndex); if (currentIndex >= 0) { - Ttk_UnmapSlave(nb->notebook.mgr, currentIndex); + Ttk_UnmapContent(nb->notebook.mgr, currentIndex); } if (currentIndex != nextIndex) { TtkSendVirtualEvent(nb->core.tkwin, "NotebookTabChanged"); @@ -695,14 +695,14 @@ static void SelectNearestTab(Notebook *nb) TtkRedisplayWidget(&nb->core); } -/* TabRemoved -- GM SlaveRemoved hook. +/* TabRemoved -- GM TabRemoved hook. * Select the next tab if the current one is being removed. * Adjust currentIndex to account for removed slave. */ static void TabRemoved(void *managerData, int index) { Notebook *nb = managerData; - Tab *tab = Ttk_SlaveData(nb->notebook.mgr, index); + Tab *tab = Ttk_ContentData(nb->notebook.mgr, index); if (index == nb->notebook.currentIndex) { SelectNearestTab(nb); @@ -735,7 +735,7 @@ static int AddTab( return TCL_ERROR; } #if 0 /* can't happen */ - if (Ttk_SlaveIndex(nb->notebook.mgr, slaveWindow) >= 0) { + if (Ttk_ContentIndex(nb->notebook.mgr, slaveWindow) >= 0) { Tcl_SetObjResult(interp, Tcl_ObjPrintf("%s already added", Tk_PathName(slaveWindow))); Tcl_SetErrorCode(interp, "TTK", "NOTEBOOK", "PRESENT", NULL); @@ -754,7 +754,7 @@ static int AddTab( return TCL_ERROR; } - Ttk_InsertSlave(nb->notebook.mgr, destIndex, slaveWindow, tab); + Ttk_InsertContent(nb->notebook.mgr, destIndex, slaveWindow, tab); /* Adjust indices and/or autoselect first tab: */ @@ -768,9 +768,9 @@ static int AddTab( } static Ttk_ManagerSpec NotebookManagerSpec = { - { "notebook", Ttk_GeometryRequestProc, Ttk_LostSlaveProc }, + { "notebook", Ttk_GeometryRequestProc, Ttk_LostContentProc }, NotebookSize, - NotebookPlaceSlaves, + NotebookPlaceContents, TabRequest, TabRemoved }; @@ -844,15 +844,15 @@ static int FindTabIndex( return TCL_OK; } - /* ... or integer index or slave window name: + /* ... or integer index or content window name: */ - if (Ttk_GetSlaveIndexFromObj( + if (Ttk_GetContentIndexFromObj( interp, nb->notebook.mgr, objPtr, index_rtn) == TCL_OK) { return TCL_OK; } - /* Nothing matched; Ttk_GetSlaveIndexFromObj will have left error message. + /* Nothing matched; Ttk_GetContentIndexFromObj will have left error message. */ return TCL_ERROR; } @@ -886,9 +886,8 @@ static int NotebookAddCommand( void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { Notebook *nb = recordPtr; - int index = Ttk_NumberSlaves(nb->notebook.mgr); Tk_Window slaveWindow; - int slaveIndex; + int index; Tab *tab; if (objc <= 2 || objc % 2 != 1) { @@ -900,13 +899,13 @@ static int NotebookAddCommand( if (!slaveWindow) { return TCL_ERROR; } - slaveIndex = Ttk_SlaveIndex(nb->notebook.mgr, slaveWindow); + index = Ttk_ContentIndex(nb->notebook.mgr, slaveWindow); - if (slaveIndex < 0) { /* New tab */ - return AddTab(interp, nb, index, slaveWindow, objc-3,objv+3); + if (index < 0) { /* New tab */ + return AddTab(interp, nb, Ttk_NumberContent(nb->notebook.mgr), slaveWindow, objc-3,objv+3); } - tab = Ttk_SlaveData(nb->notebook.mgr, slaveIndex); + tab = Ttk_ContentData(nb->notebook.mgr, index); if (tab->state == TAB_STATE_HIDDEN) { tab->state = TAB_STATE_NORMAL; } @@ -927,7 +926,7 @@ static int NotebookInsertCommand( { Notebook *nb = recordPtr; int current = nb->notebook.currentIndex; - int nSlaves = Ttk_NumberSlaves(nb->notebook.mgr); + int nContent = Ttk_NumberContent(nb->notebook.mgr); int srcIndex, destIndex; if (objc < 4) { @@ -936,8 +935,8 @@ static int NotebookInsertCommand( } if (!strcmp(Tcl_GetString(objv[2]), "end")) { - destIndex = Ttk_NumberSlaves(nb->notebook.mgr); - } else if (TCL_OK != Ttk_GetSlaveIndexFromObj( + destIndex = Ttk_NumberContent(nb->notebook.mgr); + } else if (TCL_OK != Ttk_GetContentIndexFromObj( interp, nb->notebook.mgr, objv[2], &destIndex)) { return TCL_ERROR; } @@ -952,11 +951,11 @@ static int NotebookInsertCommand( return TCL_ERROR; } - srcIndex = Ttk_SlaveIndex(nb->notebook.mgr, slaveWindow); + srcIndex = Ttk_ContentIndex(nb->notebook.mgr, slaveWindow); if (srcIndex < 0) { /* New slave */ return AddTab(interp, nb, destIndex, slaveWindow, objc-4,objv+4); } - } else if (Ttk_GetSlaveIndexFromObj( + } else if (Ttk_GetContentIndexFromObj( interp, nb->notebook.mgr, objv[3], &srcIndex) != TCL_OK) { return TCL_ERROR; @@ -965,17 +964,17 @@ static int NotebookInsertCommand( /* Move existing slave: */ if (ConfigureTab(interp, nb, - Ttk_SlaveData(nb->notebook.mgr,srcIndex), - Ttk_SlaveWindow(nb->notebook.mgr,srcIndex), + Ttk_ContentData(nb->notebook.mgr,srcIndex), + Ttk_ContentWindow(nb->notebook.mgr,srcIndex), objc-4,objv+4) != TCL_OK) { return TCL_ERROR; } - if (destIndex >= nSlaves) { - destIndex = nSlaves - 1; + if (destIndex >= nContent) { + destIndex = nContent - 1; } - Ttk_ReorderSlave(nb->notebook.mgr, srcIndex, destIndex); + Ttk_ReorderContent(nb->notebook.mgr, srcIndex, destIndex); /* Adjust internal indexes: */ @@ -1011,7 +1010,7 @@ static int NotebookForgetCommand( return TCL_ERROR; } - Ttk_ForgetSlave(nb->notebook.mgr, index); + Ttk_ForgetContent(nb->notebook.mgr, index); TtkRedisplayWidget(&nb->core); return TCL_OK; @@ -1036,7 +1035,7 @@ static int NotebookHideCommand( return TCL_ERROR; } - tab = Ttk_SlaveData(nb->notebook.mgr, index); + tab = Ttk_ContentData(nb->notebook.mgr, index); tab->state = TAB_STATE_HIDDEN; if (index == nb->notebook.currentIndex) { SelectNearestTab(nb); @@ -1075,7 +1074,7 @@ static int NotebookIdentifyCommand( tabIndex = IdentifyTab(nb, x, y); if (tabIndex >= 0) { - Tab *tab = Ttk_SlaveData(nb->notebook.mgr, tabIndex); + Tab *tab = Ttk_ContentData(nb->notebook.mgr, tabIndex); Ttk_State state = TabState(nb, tabIndex); Ttk_Layout tabLayout = nb->notebook.tabLayout; @@ -1122,8 +1121,8 @@ static int NotebookIndexCommand( * Special-case for "end": */ if (!strcmp("end", Tcl_GetString(objv[2]))) { - int nSlaves = Ttk_NumberSlaves(nb->notebook.mgr); - Tcl_SetObjResult(interp, Tcl_NewIntObj(nSlaves)); + int nContent = Ttk_NumberContent(nb->notebook.mgr); + Tcl_SetObjResult(interp, Tcl_NewIntObj(nContent)); return TCL_OK; } @@ -1146,7 +1145,7 @@ static int NotebookSelectCommand( if (objc == 2) { if (nb->notebook.currentIndex >= 0) { - Tk_Window pane = Ttk_SlaveWindow( + Tk_Window pane = Ttk_ContentWindow( nb->notebook.mgr, nb->notebook.currentIndex); Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(pane), -1)); } @@ -1179,8 +1178,8 @@ static int NotebookTabsCommand( } result = Tcl_NewListObj(0, NULL); - for (i = 0; i < Ttk_NumberSlaves(mgr); ++i) { - const char *pathName = Tk_PathName(Ttk_SlaveWindow(mgr,i)); + for (i = 0; i < Ttk_NumberContent(mgr); ++i) { + const char *pathName = Tk_PathName(Ttk_ContentWindow(mgr,i)); Tcl_ListObjAppendElement(NULL, result, Tcl_NewStringObj(pathName,-1)); } @@ -1208,8 +1207,8 @@ static int NotebookTabCommand( return TCL_ERROR; } - tab = Ttk_SlaveData(mgr, index); - slaveWindow = Ttk_SlaveWindow(mgr, index); + tab = Ttk_ContentData(mgr, index); + slaveWindow = Ttk_ContentWindow(mgr, index); if (objc == 3) { return TtkEnumerateOptions(interp, tab, @@ -1339,7 +1338,7 @@ static Ttk_Layout NotebookGetLayout( static void DisplayTab(Notebook *nb, int index, Drawable d) { Ttk_Layout tabLayout = nb->notebook.tabLayout; - Tab *tab = Ttk_SlaveData(nb->notebook.mgr, index); + Tab *tab = Ttk_ContentData(nb->notebook.mgr, index); Ttk_State state = TabState(nb, index); if (tab->state != TAB_STATE_HIDDEN) { @@ -1352,7 +1351,7 @@ static void DisplayTab(Notebook *nb, int index, Drawable d) static void NotebookDisplay(void *clientData, Drawable d) { Notebook *nb = clientData; - int nSlaves = Ttk_NumberSlaves(nb->notebook.mgr); + int nContent = Ttk_NumberContent(nb->notebook.mgr); int index; /* Draw notebook background (base layout): @@ -1362,7 +1361,7 @@ static void NotebookDisplay(void *clientData, Drawable d) /* Draw tabs from left to right, but draw the current tab last * so it will overwrite its neighbors. */ - for (index = 0; index < nSlaves; ++index) { + for (index = 0; index < nContent; ++index) { if (index != nb->notebook.currentIndex) { DisplayTab(nb, index, d); } diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c index 704e90c..85f0b26 100644 --- a/generic/ttk/ttkPanedwindow.c +++ b/generic/ttk/ttkPanedwindow.c @@ -7,7 +7,7 @@ */ #include <string.h> -#include <tk.h> +#include "tkInt.h" #include "ttkManager.h" #include "ttkTheme.h" #include "ttkWidget.h" @@ -78,7 +78,7 @@ typedef struct { static Tk_OptionSpec PanedOptionSpecs[] = { {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "vertical", Tk_Offset(Paned,paned.orientObj), Tk_Offset(Paned,paned.orient), - 0,(ClientData)ttkOrientStrings,READONLY_OPTION|STYLE_CHANGED }, + 0,(void *)ttkOrientStrings,READONLY_OPTION|STYLE_CHANGED }, {TK_OPTION_INT, "-width", "width", "Width", "0", -1,Tk_Offset(Paned,paned.width), 0,0,GEOMETRY_CHANGED }, @@ -91,7 +91,7 @@ static Tk_OptionSpec PanedOptionSpecs[] = { }; /*------------------------------------------------------------------------ - * +++ Slave pane record. + * +++ Pane record. */ typedef struct { int reqSize; /* Pane request size */ @@ -189,14 +189,14 @@ error: static int ShoveUp(Paned *pw, int i, int pos) { - Pane *pane = Ttk_SlaveData(pw->paned.mgr, i); + Pane *pane = Ttk_ContentData(pw->paned.mgr, i); int sashThickness = pw->paned.sashThickness; if (i == 0) { if (pos < 0) pos = 0; } else { - Pane *prevPane = Ttk_SlaveData(pw->paned.mgr, i-1); + Pane *prevPane = Ttk_ContentData(pw->paned.mgr, i-1); if (pos < prevPane->sashPos + sashThickness) pos = ShoveUp(pw, i-1, pos - sashThickness) + sashThickness; } @@ -209,13 +209,13 @@ static int ShoveUp(Paned *pw, int i, int pos) */ static int ShoveDown(Paned *pw, int i, int pos) { - Pane *pane = Ttk_SlaveData(pw->paned.mgr,i); + Pane *pane = Ttk_ContentData(pw->paned.mgr,i); int sashThickness = pw->paned.sashThickness; - if (i == Ttk_NumberSlaves(pw->paned.mgr) - 1) { + if (i == Ttk_NumberContent(pw->paned.mgr) - 1) { pos = pane->sashPos; /* Sentinel value == container window size */ } else { - Pane *nextPane = Ttk_SlaveData(pw->paned.mgr,i+1); + Pane *nextPane = Ttk_ContentData(pw->paned.mgr,i+1); if (pos + sashThickness > nextPane->sashPos) pos = ShoveDown(pw, i+1, pos + sashThickness) - sashThickness; } @@ -231,7 +231,7 @@ static int ShoveDown(Paned *pw, int i, int pos) static int PanedSize(void *recordPtr, int *widthPtr, int *heightPtr) { Paned *pw = recordPtr; - int nPanes = Ttk_NumberSlaves(pw->paned.mgr); + int nPanes = Ttk_NumberContent(pw->paned.mgr); int nSashes = nPanes - 1; int sashThickness = pw->paned.sashThickness; int width = 0, height = 0; @@ -239,8 +239,8 @@ static int PanedSize(void *recordPtr, int *widthPtr, int *heightPtr) if (pw->paned.orient == TTK_ORIENT_HORIZONTAL) { for (index = 0; index < nPanes; ++index) { - Pane *pane = Ttk_SlaveData(pw->paned.mgr, index); - Tk_Window slaveWindow = Ttk_SlaveWindow(pw->paned.mgr, index); + Pane *pane = Ttk_ContentData(pw->paned.mgr, index); + Tk_Window slaveWindow = Ttk_ContentWindow(pw->paned.mgr, index); if (height < Tk_ReqHeight(slaveWindow)) height = Tk_ReqHeight(slaveWindow); @@ -249,8 +249,8 @@ static int PanedSize(void *recordPtr, int *widthPtr, int *heightPtr) width += nSashes * sashThickness; } else { for (index = 0; index < nPanes; ++index) { - Pane *pane = Ttk_SlaveData(pw->paned.mgr, index); - Tk_Window slaveWindow = Ttk_SlaveWindow(pw->paned.mgr, index); + Pane *pane = Ttk_ContentData(pw->paned.mgr, index); + Tk_Window slaveWindow = Ttk_ContentWindow(pw->paned.mgr, index); if (width < Tk_ReqWidth(slaveWindow)) width = Tk_ReqWidth(slaveWindow); @@ -278,8 +278,8 @@ static void AdjustPanes(Paned *pw) int pos = 0; int index; - for (index = 0; index < Ttk_NumberSlaves(pw->paned.mgr); ++index) { - Pane *pane = Ttk_SlaveData(pw->paned.mgr, index); + for (index = 0; index < Ttk_NumberContent(pw->paned.mgr); ++index) { + Pane *pane = Ttk_ContentData(pw->paned.mgr, index); int size = pane->sashPos - pos; pane->reqSize = size >= 0 ? size : 0; pos = pane->sashPos + sashThickness; @@ -305,7 +305,7 @@ static void AdjustPanes(Paned *pw) static void PlaceSashes(Paned *pw, int width, int height) { Ttk_Manager *mgr = pw->paned.mgr; - int nPanes = Ttk_NumberSlaves(mgr); + int nPanes = Ttk_NumberContent(mgr); int sashThickness = pw->paned.sashThickness; int available = pw->paned.orient == TTK_ORIENT_HORIZONTAL ? width : height; int reqSize = 0, totalWeight = 0; @@ -317,7 +317,7 @@ static void PlaceSashes(Paned *pw, int width, int height) /* Compute total required size and total available weight: */ for (i = 0; i < nPanes; ++i) { - Pane *pane = Ttk_SlaveData(mgr, i); + Pane *pane = Ttk_ContentData(mgr, i); reqSize += pane->reqSize; totalWeight += pane->weight * (pane->reqSize != 0); } @@ -341,7 +341,7 @@ static void PlaceSashes(Paned *pw, int width, int height) */ pos = 0; for (i = 0; i < nPanes; ++i) { - Pane *pane = Ttk_SlaveData(mgr, i); + Pane *pane = Ttk_ContentData(mgr, i); int weight = pane->weight * (pane->reqSize != 0); int size = pane->reqSize + delta * weight; @@ -375,18 +375,18 @@ static void PlacePanes(Paned *pw) int pos = 0; int index; - for (index = 0; index < Ttk_NumberSlaves(pw->paned.mgr); ++index) { - Pane *pane = Ttk_SlaveData(pw->paned.mgr, index); + for (index = 0; index < Ttk_NumberContent(pw->paned.mgr); ++index) { + Pane *pane = Ttk_ContentData(pw->paned.mgr, index); int size = pane->sashPos - pos; if (size > 0) { if (horizontal) { - Ttk_PlaceSlave(pw->paned.mgr, index, pos, 0, size, height); + Ttk_PlaceContent(pw->paned.mgr, index, pos, 0, size, height); } else { - Ttk_PlaceSlave(pw->paned.mgr, index, 0, pos, width, size); + Ttk_PlaceContent(pw->paned.mgr, index, 0, pos, width, size); } } else { - Ttk_UnmapSlave(pw->paned.mgr, index); + Ttk_UnmapContent(pw->paned.mgr, index); } pos = pane->sashPos + sashThickness; @@ -397,7 +397,7 @@ static void PlacePanes(Paned *pw) * +++ Manager specification. */ -static void PanedPlaceSlaves(void *managerData) +static void PanedPlaceContent(void *managerData) { Paned *pw = managerData; PlaceSashes(pw, Tk_Width(pw->core.tkwin), Tk_Height(pw->core.tkwin)); @@ -407,7 +407,7 @@ static void PanedPlaceSlaves(void *managerData) static void PaneRemoved(void *managerData, int index) { Paned *pw = managerData; - Pane *pane = Ttk_SlaveData(pw->paned.mgr, index); + Pane *pane = Ttk_ContentData(pw->paned.mgr, index); DestroyPane(pw, pane); } @@ -420,7 +420,7 @@ static int AddPane( if (!Ttk_Maintainable(interp, slaveWindow, pw->core.tkwin)) { return TCL_ERROR; } - if (Ttk_SlaveIndex(pw->paned.mgr, slaveWindow) >= 0) { + if (Ttk_ContentIndex(pw->paned.mgr, slaveWindow) >= 0) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "%s already added", Tk_PathName(slaveWindow))); Tcl_SetErrorCode(interp, "TTK", "PANE", "PRESENT", NULL); @@ -436,7 +436,7 @@ static int AddPane( return TCL_ERROR; } - Ttk_InsertSlave(pw->paned.mgr, destIndex, slaveWindow, pane); + Ttk_InsertContent(pw->paned.mgr, destIndex, slaveWindow, pane); return TCL_OK; } @@ -449,8 +449,8 @@ static int AddPane( static int PaneRequest(void *managerData, int index, int width, int height) { Paned *pw = managerData; - Pane *pane = Ttk_SlaveData(pw->paned.mgr, index); - Tk_Window slaveWindow = Ttk_SlaveWindow(pw->paned.mgr, index); + Pane *pane = Ttk_ContentData(pw->paned.mgr, index); + Tk_Window slaveWindow = Ttk_ContentWindow(pw->paned.mgr, index); int horizontal = pw->paned.orient == TTK_ORIENT_HORIZONTAL; if (!Tk_IsMapped(slaveWindow)) { @@ -460,9 +460,9 @@ static int PaneRequest(void *managerData, int index, int width, int height) } static Ttk_ManagerSpec PanedManagerSpec = { - { "panedwindow", Ttk_GeometryRequestProc, Ttk_LostSlaveProc }, + { "panedwindow", Ttk_GeometryRequestProc, Ttk_LostContentProc }, PanedSize, - PanedPlaceSlaves, + PanedPlaceContent, PaneRequest, PaneRemoved }; @@ -581,7 +581,7 @@ static Ttk_Layout PanedGetLayout( */ static Ttk_Layout SashLayout(Paned *pw, int index) { - Pane *pane = Ttk_SlaveData(pw->paned.mgr, index); + Pane *pane = Ttk_ContentData(pw->paned.mgr, index); int thickness = pw->paned.sashThickness, height = Tk_Height(pw->core.tkwin), width = Tk_Width(pw->core.tkwin), @@ -604,7 +604,7 @@ static void DrawSash(Paned *pw, int index, Drawable d) static void PanedDisplay(void *recordPtr, Drawable d) { Paned *pw = recordPtr; - int i, nSashes = Ttk_NumberSlaves(pw->paned.mgr) - 1; + int i, nSashes = Ttk_NumberContent(pw->paned.mgr) - 1; TtkWidgetDisplay(recordPtr, d); for (i = 0; i < nSashes; ++i) { @@ -636,7 +636,7 @@ static int PanedAddCommand( return TCL_ERROR; } - return AddPane(interp, pw, Ttk_NumberSlaves(pw->paned.mgr), slaveWindow, + return AddPane(interp, pw, Ttk_NumberContent(pw->paned.mgr), slaveWindow, objc - 3, objv + 3); } @@ -647,7 +647,7 @@ static int PanedInsertCommand( void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { Paned *pw = recordPtr; - int nSlaves = Ttk_NumberSlaves(pw->paned.mgr); + int nContent = Ttk_NumberContent(pw->paned.mgr); int srcIndex, destIndex; Tk_Window slaveWindow; @@ -663,26 +663,26 @@ static int PanedInsertCommand( } if (!strcmp(Tcl_GetString(objv[2]), "end")) { - destIndex = Ttk_NumberSlaves(pw->paned.mgr); - } else if (TCL_OK != Ttk_GetSlaveIndexFromObj( + destIndex = Ttk_NumberContent(pw->paned.mgr); + } else if (TCL_OK != Ttk_GetContentIndexFromObj( interp,pw->paned.mgr,objv[2],&destIndex)) { return TCL_ERROR; } - srcIndex = Ttk_SlaveIndex(pw->paned.mgr, slaveWindow); + srcIndex = Ttk_ContentIndex(pw->paned.mgr, slaveWindow); if (srcIndex < 0) { /* New slave: */ return AddPane(interp, pw, destIndex, slaveWindow, objc-4, objv+4); } /* else -- move existing slave: */ - if (destIndex >= nSlaves) - destIndex = nSlaves - 1; - Ttk_ReorderSlave(pw->paned.mgr, srcIndex, destIndex); + if (destIndex >= nContent) + destIndex = nContent - 1; + Ttk_ReorderContent(pw->paned.mgr, srcIndex, destIndex); return objc == 4 ? TCL_OK : ConfigurePane(interp, pw, - Ttk_SlaveData(pw->paned.mgr, destIndex), - Ttk_SlaveWindow(pw->paned.mgr, destIndex), + Ttk_ContentData(pw->paned.mgr, destIndex), + Ttk_ContentWindow(pw->paned.mgr, destIndex), objc-4,objv+4); } @@ -699,12 +699,12 @@ static int PanedForgetCommand( return TCL_ERROR; } - if (TCL_OK != Ttk_GetSlaveIndexFromObj( + if (TCL_OK != Ttk_GetContentIndexFromObj( interp, pw->paned.mgr, objv[2], &paneIndex)) { return TCL_ERROR; } - Ttk_ForgetSlave(pw->paned.mgr, paneIndex); + Ttk_ForgetContent(pw->paned.mgr, paneIndex); return TCL_OK; } @@ -720,7 +720,7 @@ static int PanedIdentifyCommand( int what = IDENTIFY_SASH; Paned *pw = recordPtr; int sashThickness = pw->paned.sashThickness; - int nSashes = Ttk_NumberSlaves(pw->paned.mgr) - 1; + int nSashes = Ttk_NumberContent(pw->paned.mgr) - 1; int x, y, pos; int index; @@ -739,7 +739,7 @@ static int PanedIdentifyCommand( pos = pw->paned.orient == TTK_ORIENT_HORIZONTAL ? x : y; for (index = 0; index < nSashes; ++index) { - Pane *pane = Ttk_SlaveData(pw->paned.mgr, index); + Pane *pane = Ttk_ContentData(pw->paned.mgr, index); if (pane->sashPos <= pos && pos <= pane->sashPos + sashThickness) { /* Found it. */ switch (what) { @@ -779,14 +779,14 @@ static int PanedPaneCommand( return TCL_ERROR; } - if (TCL_OK != Ttk_GetSlaveIndexFromObj( + if (TCL_OK != Ttk_GetContentIndexFromObj( interp,pw->paned.mgr,objv[2],&paneIndex)) { return TCL_ERROR; } - pane = Ttk_SlaveData(pw->paned.mgr, paneIndex); - slaveWindow = Ttk_SlaveWindow(pw->paned.mgr, paneIndex); + pane = Ttk_ContentData(pw->paned.mgr, paneIndex); + slaveWindow = Ttk_ContentWindow(pw->paned.mgr, paneIndex); switch (objc) { case 3: @@ -817,8 +817,8 @@ static int PanedPanesCommand( } panes = Tcl_NewListObj(0, NULL); - for (i = 0; i < Ttk_NumberSlaves(mgr); ++i) { - const char *pathName = Tk_PathName(Ttk_SlaveWindow(mgr,i)); + for (i = 0; i < Ttk_NumberContent(mgr); ++i) { + const char *pathName = Tk_PathName(Ttk_ContentWindow(mgr,i)); Tcl_ListObjAppendElement(interp, panes, Tcl_NewStringObj(pathName,-1)); } Tcl_SetObjResult(interp, panes); @@ -844,14 +844,14 @@ static int PanedSashposCommand( if (Tcl_GetIntFromObj(interp, objv[2], &sashIndex) != TCL_OK) { return TCL_ERROR; } - if (sashIndex < 0 || sashIndex >= Ttk_NumberSlaves(pw->paned.mgr) - 1) { + if (sashIndex < 0 || sashIndex >= Ttk_NumberContent(pw->paned.mgr) - 1) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "sash index %d out of range", sashIndex)); Tcl_SetErrorCode(interp, "TTK", "PANE", "SASH_INDEX", NULL); return TCL_ERROR; } - pane = Ttk_SlaveData(pw->paned.mgr, sashIndex); + pane = Ttk_ContentData(pw->paned.mgr, sashIndex); if (objc == 3) { Tcl_SetObjResult(interp, Tcl_NewIntObj(pane->sashPos)); diff --git a/generic/ttk/ttkProgress.c b/generic/ttk/ttkProgress.c index eb776ba..ae945ae 100644 --- a/generic/ttk/ttkProgress.c +++ b/generic/ttk/ttkProgress.c @@ -5,8 +5,7 @@ */ #include <math.h> -#include <tk.h> - +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" @@ -48,14 +47,14 @@ static Tk_OptionSpec ProgressbarOptionSpecs[] = { {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "horizontal", Tk_Offset(Progressbar,progress.orientObj), -1, - 0, (ClientData)ttkOrientStrings, STYLE_CHANGED }, + 0, (void *)ttkOrientStrings, STYLE_CHANGED }, {TK_OPTION_PIXELS, "-length", "length", "Length", DEF_PROGRESSBAR_LENGTH, Tk_Offset(Progressbar,progress.lengthObj), -1, 0, 0, GEOMETRY_CHANGED }, {TK_OPTION_STRING_TABLE, "-mode", "mode", "ProgressMode", "determinate", Tk_Offset(Progressbar,progress.modeObj), Tk_Offset(Progressbar,progress.mode), - 0, (ClientData)ProgressbarModeStrings, 0 }, + 0, (void *)ProgressbarModeStrings, 0 }, {TK_OPTION_DOUBLE, "-maximum", "maximum", "Maximum", "100", Tk_Offset(Progressbar,progress.maximumObj), -1, 0, 0, 0 }, diff --git a/generic/ttk/ttkScale.c b/generic/ttk/ttkScale.c index 8348fb5..4d05f97 100644 --- a/generic/ttk/ttkScale.c +++ b/generic/ttk/ttkScale.c @@ -4,9 +4,9 @@ * ttk::scale widget. */ -#include <tk.h> #include <string.h> #include <stdio.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" @@ -63,7 +63,7 @@ static Tk_OptionSpec ScaleOptionSpecs[] = {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "horizontal", Tk_Offset(Scale,scale.orientObj), Tk_Offset(Scale,scale.orient), 0, - (ClientData)ttkOrientStrings, STYLE_CHANGED }, + (void *)ttkOrientStrings, STYLE_CHANGED }, {TK_OPTION_DOUBLE, "-from", "from", "From", "0", Tk_Offset(Scale,scale.fromObj), -1, 0, 0, 0}, diff --git a/generic/ttk/ttkScrollbar.c b/generic/ttk/ttkScrollbar.c index 2c8d195..5ffd671 100644 --- a/generic/ttk/ttkScrollbar.c +++ b/generic/ttk/ttkScrollbar.c @@ -4,8 +4,7 @@ * ttk::scrollbar widget. */ -#include <tk.h> - +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" @@ -40,7 +39,7 @@ static Tk_OptionSpec ScrollbarOptionSpecs[] = {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "vertical", Tk_Offset(Scrollbar,scrollbar.orientObj), Tk_Offset(Scrollbar,scrollbar.orient), - 0,(ClientData)ttkOrientStrings,STYLE_CHANGED }, + 0, (void *)ttkOrientStrings, STYLE_CHANGED }, WIDGET_TAKEFOCUS_FALSE, WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs) diff --git a/generic/ttk/ttkSeparator.c b/generic/ttk/ttkSeparator.c index b52e6f4..a0ae596 100644 --- a/generic/ttk/ttkSeparator.c +++ b/generic/ttk/ttkSeparator.c @@ -4,8 +4,7 @@ * ttk::separator and ttk::sizegrip widgets. */ -#include <tk.h> - +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" @@ -27,7 +26,7 @@ static Tk_OptionSpec SeparatorOptionSpecs[] = { {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "horizontal", Tk_Offset(Separator,separator.orientObj), Tk_Offset(Separator,separator.orient), - 0,(ClientData)ttkOrientStrings,STYLE_CHANGED }, + 0, (void *)ttkOrientStrings, STYLE_CHANGED }, WIDGET_TAKEFOCUS_FALSE, WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs) diff --git a/generic/ttk/ttkSquare.c b/generic/ttk/ttkSquare.c index b5bf6f9..bd2a8c7 100644 --- a/generic/ttk/ttkSquare.c +++ b/generic/ttk/ttkSquare.c @@ -3,7 +3,7 @@ * Minimal sample ttk widget. */ -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkState.c b/generic/ttk/ttkState.c index 5b62f3c..d37f7f6 100644 --- a/generic/ttk/ttkState.c +++ b/generic/ttk/ttkState.c @@ -6,8 +6,7 @@ */ #include <string.h> - -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" /* diff --git a/generic/ttk/ttkStubInit.c b/generic/ttk/ttkStubInit.c index 87b33dc..0039585 100644 --- a/generic/ttk/ttkStubInit.c +++ b/generic/ttk/ttkStubInit.c @@ -3,7 +3,7 @@ * It is compiled and linked in with the ttk package proper. */ -#include "tk.h" +#include "tkInt.h" #include "ttkTheme.h" MODULE_SCOPE const TtkStubs ttkStubs; diff --git a/generic/ttk/ttkStubLib.c b/generic/ttk/ttkStubLib.c index 5675416..faeabe8 100644 --- a/generic/ttk/ttkStubLib.c +++ b/generic/ttk/ttkStubLib.c @@ -6,7 +6,7 @@ #undef USE_TCL_STUBS #define USE_TCL_STUBS -#include "tk.h" +#include "tkInt.h" #define USE_TTK_STUBS 1 #include "ttkTheme.h" diff --git a/generic/ttk/ttkTagSet.c b/generic/ttk/ttkTagSet.c index 07aee76..fc026cb 100644 --- a/generic/ttk/ttkTagSet.c +++ b/generic/ttk/ttkTagSet.c @@ -5,8 +5,7 @@ */ #include <string.h> /* for memset() */ -#include <tcl.h> -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c index 7bde80e..8723b94 100644 --- a/generic/ttk/ttkTheme.c +++ b/generic/ttk/ttkTheme.c @@ -384,7 +384,7 @@ typedef struct CleanupStruct { } Cleanup; /*------------------------------------------------------------------------ - * +++ Master style package data structure. + * +++ Style package data structure. */ typedef struct { @@ -398,7 +398,7 @@ typedef struct int themeChangePending; /* scheduled ThemeChangedProc call? */ } StylePackageData; -static void ThemeChangedProc(ClientData); /* Forward */ +static void ThemeChangedProc(void *); /* Forward */ /* Ttk_StylePkgFree -- * Cleanup procedure for StylePackageData. @@ -1171,7 +1171,7 @@ static Tcl_Obj* HashTableToDict(Tcl_HashTable *ht) */ static int StyleMapCmd( - ClientData clientData, /* Master StylePackageData pointer */ + ClientData clientData, /* StylePackageData pointer */ Tcl_Interp *interp, /* Current interpreter */ int objc, /* Number of arguments */ Tcl_Obj *const objv[]) /* Argument objects */ @@ -1448,7 +1448,7 @@ static int StyleThemeNamesCmd( */ static int StyleThemeSettingsCmd( - ClientData clientData, /* Master StylePackageData pointer */ + ClientData clientData, /* StylePackageData pointer */ Tcl_Interp *interp, /* Current interpreter */ int objc, /* Number of arguments */ Tcl_Obj *const objv[]) /* Argument objects */ @@ -1606,7 +1606,7 @@ static int StyleLayoutCmd( */ static int StyleThemeUseCmd( - ClientData clientData, /* Master StylePackageData pointer */ + ClientData clientData, /* StylePackageData pointer */ Tcl_Interp *interp, /* Current interpreter */ int objc, /* Number of arguments */ Tcl_Obj *const objv[]) /* Argument objects */ @@ -1663,7 +1663,7 @@ static const Ttk_Ensemble StyleEnsemble[] = { static int StyleObjCmd( - ClientData clientData, /* Master StylePackageData pointer */ + ClientData clientData, /* StylePackageData pointer */ Tcl_Interp *interp, /* Current interpreter */ int objc, /* Number of arguments */ Tcl_Obj *const objv[]) /* Argument objects */ diff --git a/generic/ttk/ttkTrace.c b/generic/ttk/ttkTrace.c index 919f25a..d086c02 100644 --- a/generic/ttk/ttkTrace.c +++ b/generic/ttk/ttkTrace.c @@ -7,7 +7,7 @@ * from other errors (which are not). */ -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" @@ -53,7 +53,7 @@ VarTraceProc( */ if (tracePtr->interp == NULL) { Tcl_DecrRefCount(tracePtr->varnameObj); - ckfree((ClientData)tracePtr); + ckfree(tracePtr); return NULL; } Tcl_TraceVar2(interp, name, NULL, @@ -98,7 +98,7 @@ Ttk_TraceHandle *Ttk_TraceVariable( status = Tcl_TraceVar2(interp, Tcl_GetString(varnameObj), NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS, - VarTraceProc, (ClientData)h); + VarTraceProc, h); if (status != TCL_OK) { Tcl_DecrRefCount(h->varnameObj); @@ -139,7 +139,7 @@ void Ttk_UntraceVariable(Ttk_TraceHandle *h) */ while ((cd = Tcl_VarTraceInfo(h->interp, Tcl_GetString(h->varnameObj), TCL_GLOBAL_ONLY, VarTraceProc, cd)) != NULL) { - if (cd == (ClientData) h) { + if (cd == h) { break; } } @@ -154,7 +154,7 @@ void Ttk_UntraceVariable(Ttk_TraceHandle *h) } Tcl_UntraceVar2(h->interp, Tcl_GetString(h->varnameObj), NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS, - VarTraceProc, (ClientData)h); + VarTraceProc, h); Tcl_DecrRefCount(h->varnameObj); ckfree(h); } diff --git a/generic/ttk/ttkTrack.c b/generic/ttk/ttkTrack.c index 396b073..fa2a7e0 100644 --- a/generic/ttk/ttkTrack.c +++ b/generic/ttk/ttkTrack.c @@ -23,7 +23,7 @@ * TODO: Handle "chords" properly (e.g., <B1-ButtonPress-2>) */ -#include <tk.h> +#include "tkInt.h" #include "ttkTheme.h" #include "ttkWidget.h" diff --git a/macosx/tkMacOSX.h b/macosx/tkMacOSX.h index 05ea6c2..3ab0a34 100644 --- a/macosx/tkMacOSX.h +++ b/macosx/tkMacOSX.h @@ -26,7 +26,7 @@ typedef int (Tk_MacOSXEmbedRegisterWinProc) (long winID, Tk_Window window); typedef void* (Tk_MacOSXEmbedGetGrafPortProc) (Tk_Window window); typedef int (Tk_MacOSXEmbedMakeContainerExistProc) (Tk_Window window); -typedef void (Tk_MacOSXEmbedGetClipProc) (Tk_Window window, TkRegion rgn); +typedef void (Tk_MacOSXEmbedGetClipProc) (Tk_Window window, void *rgn); typedef void (Tk_MacOSXEmbedGetOffsetInParentProc) (Tk_Window window, void *ulCorner); #include "tkPlatDecls.h" diff --git a/tests/bind.test b/tests/bind.test index b6e3e53..6868eba 100644 --- a/tests/bind.test +++ b/tests/bind.test @@ -6948,7 +6948,7 @@ test bind-35.3 {Events agree for modifier keys} -constraints {aqua} -setup { } -cleanup { } -result pass -test bind-36.1 {pointer warp with grab on master, bug [e3888d5820]} -setup { +test bind-36.1 {pointer warp with grab on toplevel, bug [e3888d5820]} -setup { pointerAway toplevel .top grab release .top diff --git a/tests/focus.test b/tests/focus.test index 7a7e5ef..3d9d7c3 100644 --- a/tests/focus.test +++ b/tests/focus.test @@ -104,7 +104,7 @@ test focus-1.7 {Tk_FocusCmd procedure} -constraints unix -body { focus .gorp a } -returnCodes error -result {bad option ".gorp": must be -displayof, -force, or -lastfor} test focus-1.8 {Tk_FocusCmd procedure, focussing on dead window} -constraints { - unix + unix } -setup { destroy .t2 } -body { @@ -130,29 +130,29 @@ test focus-1.8 {Tk_FocusCmd procedure, focussing on dead window} -constraints { destroy .t2 } -result {.t2.f2 .t2 .t2} test focus-1.9 {Tk_FocusCmd procedure, -displayof option} -constraints { - unix + unix } -body { focus -displayof } -returnCodes error -result {wrong # args: should be "focus -displayof window"} test focus-1.10 {Tk_FocusCmd procedure, -displayof option} -constraints { - unix + unix } -body { focus -displayof a b } -returnCodes error -result {wrong # args: should be "focus -displayof window"} test focus-1.11 {Tk_FocusCmd procedure, -displayof option} -constraints { - unix + unix } -body { focus -displayof .lousy } -returnCodes error -result {bad window path name ".lousy"} test focus-1.12 {Tk_FocusCmd procedure, -displayof option} -constraints { - unix + unix } -body { focusClear focus .t focus -displayof .t.b3 } -result {} test focus-1.13 {Tk_FocusCmd procedure, -displayof option} -constraints { - unix + unix } -body { focusClear focus -force .t @@ -185,22 +185,22 @@ test focus-1.19 {Tk_FocusCmd procedure, -force option} -constraints unix -body { lappend x [focus] } -result {{} .t.b1} test focus-1.20 {Tk_FocusCmd procedure, -lastfor option} -constraints { - unix + unix } -body { focus -lastfor } -returnCodes error -result {wrong # args: should be "focus -lastfor window"} test focus-1.21 {Tk_FocusCmd procedure, -lastfor option} -constraints { - unix + unix } -body { focus -lastfor 1 2 } -returnCodes error -result {wrong # args: should be "focus -lastfor window"} test focus-1.22 {Tk_FocusCmd procedure, -lastfor option} -constraints { - unix + unix } -body { focus -lastfor who_knows? } -returnCodes error -result {bad window path name "who_knows?"} test focus-1.23 {Tk_FocusCmd procedure, -lastfor option} -constraints { - unix + unix } -body { focusClear focusSetup @@ -209,7 +209,7 @@ test focus-1.23 {Tk_FocusCmd procedure, -lastfor option} -constraints { list [focus -lastfor .] [focus -lastfor .t.b3] } -result {.b .t.b1} test focus-1.24 {Tk_FocusCmd procedure, -lastfor option} -constraints { - unix + unix } -body { focusClear focusSetup @@ -624,7 +624,7 @@ fixfocus test focus-6.1 {miscellaneous - embedded application in same process} -constraints { unix testwrapper } -setup { - eval interp delete [interp slaves] + eval interp delete [interp children] } -body { toplevel .t wm geometry .t +0+0 diff --git a/tests/grid.test b/tests/grid.test index eef42e1..dd02729 100644 --- a/tests/grid.test +++ b/tests/grid.test @@ -145,7 +145,7 @@ test grid-3.1 {configure: basic argument checking} -body { test grid-3.2 {configure: basic argument checking} -body { button .b grid configure .b - grid slaves . + grid content . } -cleanup { grid_reset 3.2 } -result {.b} @@ -183,7 +183,7 @@ test grid-3.7 {configure: basic argument checking} -body { test grid-3.8 {configure: basic argument checking} -body { button .b grid configure x .b - grid slaves . + grid content . } -cleanup { grid_reset 3.8 } -result {.b} @@ -193,7 +193,7 @@ test grid-3.9 {configure: basic argument checking} -body { } -cleanup { grid_reset 3.9 } -returnCodes error -result {invalid window shortcut, "y" should be '-', 'x', or '^'} -test grid-3.10 {ConfigureSlave procedure, bad -in option} -body { +test grid-3.10 {ConfigureContent procedure, bad -in option} -body { frame .f grid .f -in .f } -cleanup { @@ -224,9 +224,9 @@ test grid-4.1 {forget: basic argument checking} -body { test grid-4.2 {forget} -body { button .c grid [button .b] - set a [grid slaves .] + set a [grid content .] grid forget .b .c - lappend a [grid slaves .] + lappend a [grid content .] return $a } -cleanup { grid_reset 4.2 @@ -516,43 +516,43 @@ test grid-8.6 {size} -body { grid_reset 8.6 } -result {{51 11} {51 11} {31 11} {21 11} {16 1} {1 1}} -test grid-9.1 {slaves} -body { - grid slaves . +test grid-9.1 {content} -body { + grid content . } -returnCodes ok -result {} -test grid-9.2 {slaves} -body { - grid slaves .foo +test grid-9.2 {content} -body { + grid content .foo } -returnCodes error -result {bad window path name ".foo"} -test grid-9.3 {slaves} -body { - grid slaves a b -} -returnCodes error -result {wrong # args: should be "grid slaves window ?-option value ...?"} -test grid-9.4 {slaves} -body { - grid slaves . a b +test grid-9.3 {content} -body { + grid content a b +} -returnCodes error -result {wrong # args: should be "grid content window ?-option value ...?"} +test grid-9.4 {content} -body { + grid content . a b } -returnCodes error -result {bad option "a": must be -column or -row} -test grid-9.5 {slaves} -body { - grid slaves . -column x +test grid-9.5 {content} -body { + grid content . -column x } -returnCodes error -result {expected integer but got "x"} -test grid-9.6 {slaves} -body { - grid slaves . -row -3 +test grid-9.6 {content} -body { + grid content . -row -3 } -returnCodes error -result {-3 is an invalid value: should NOT be < 0} -test grid-9.7 {slaves} -body { - grid slaves . -foo 3 +test grid-9.7 {content} -body { + grid content . -foo 3 } -returnCodes error -result {bad option "-foo": must be -column or -row} -test grid-9.8 {slaves} -body { - grid slaves .x -row 3 +test grid-9.8 {content} -body { + grid content .x -row 3 } -returnCodes error -result {bad window path name ".x"} -test grid-9.9 {slaves} -body { - grid slaves . -row 3 +test grid-9.9 {content} -body { + grid content . -row 3 } -returnCodes ok -result {} -test grid-9.10 {slaves} -body { +test grid-9.10 {content} -body { foreach i {0 1 2} { label .$i -text $i grid .$i -row $i -column $i } - grid slaves . + grid content . } -cleanup { grid_reset 9.10 } -result {.2 .1 .0} -test grid-9.11 {slaves} -body { +test grid-9.11 {content} -body { catch {unset a} foreach i {0 1 2} { label .$i -text $i @@ -561,10 +561,10 @@ test grid-9.11 {slaves} -body { grid .$i-x -row $i -column [incr i] } foreach row {0 1 2 3} { - lappend a $row{[grid slaves . -row $row]} + lappend a $row{[grid content . -row $row]} } foreach col {0 1 2 3} { - lappend a $col{[grid slaves . -column $col]} + lappend a $col{[grid content . -column $col]} } return $a } -cleanup { @@ -1305,10 +1305,10 @@ test grid-13.20 {reparenting} -body { grid .b -in .1 set a "" catch {unset info}; array set info [grid info .b] - lappend a [grid slaves .1],[grid slaves .2],$info(-in) + lappend a [grid content .1],[grid content .2],$info(-in) grid .b -in .2 catch {unset info}; array set info [grid info .b] - lappend a [grid slaves .1],[grid slaves .2],$info(-in) + lappend a [grid content .1],[grid content .2],$info(-in) unset info return $a } -cleanup { @@ -1369,27 +1369,27 @@ test grid-14.3 {map notify: bug 1648} -constraints {nonPortable} -body { grid_reset 14.3 } -result {.2 2 .0 1 . 2 .1 1} -test grid-15.1 {lost slave} -body { +test grid-15.1 {lost content} -body { button .b grid .b - set a [grid slaves .] + set a [grid content .] pack .b - lappend a [grid slaves .] + lappend a [grid content .] grid .b - lappend a [grid slaves .] + lappend a [grid content .] } -cleanup { grid_reset 15.1 } -result {.b {} .b} -test grid-15.2 {lost slave} -body { +test grid-15.2 {lost content} -body { frame .f grid .f button .b grid .b -in .f - set a [grid slaves .f] + set a [grid content .f] pack .b -in .f - lappend a [grid slaves .f] + lappend a [grid content .f] grid .b -in .f - lappend a [grid slaves .f] + lappend a [grid content .f] } -cleanup { grid_reset 15.2 } -result {.b {} .b} @@ -1975,9 +1975,9 @@ test grid-22.1 {remove: basic argument checking} { test grid-22.2 {remove} { button .c grid [button .b] - set a [grid slaves .] + set a [grid content .] grid remove .b .c - lappend a [grid slaves .] + lappend a [grid content .] return $a } {.b {}} grid_reset 22.2 @@ -2024,7 +2024,7 @@ test grid-22.5 {remove} { } {-in . -column 0 -row 0 -columnspan 2 -rowspan 2 -ipadx 0 -ipady 0 -padx {3 5} -pady {4 7} -sticky ns} grid_reset 22.5 -test grid-23 {grid configure -in leaked from previous master - bug +test grid-23 {grid configure -in leaked from previous container window - bug 6aea69fccbb266b7f0437686379fbe5b55442958} { frame .f frame .g diff --git a/tests/imgBmap.test b/tests/imgBmap.test index e7f2c7e..a2ebdfa 100644 --- a/tests/imgBmap.test +++ b/tests/imgBmap.test @@ -137,28 +137,28 @@ test imageBmap-2.2 {ImgBmapCreate procedure} -setup { } -result {image1 image1 0 0 #000000 {}} -test imageBmap-3.1 {ImgBmapConfigureMaster procedure, memory de-allocation} -body { +test imageBmap-3.1 {ImgBmapConfigureModel procedure, memory de-allocation} -body { image create bitmap i1 -data $data1 i1 configure -data $data1 } -cleanup { image delete i1 } -result {} -test imageBmap-3.2 {ImgBmapConfigureMaster procedure} -body { +test imageBmap-3.2 {ImgBmapConfigureModel procedure} -body { image create bitmap i1 -data $data1 list [catch {i1 configure -data bogus} msg] $msg [image width i1] \ [image height i1] } -result {1 {format error in bitmap data} 16 16} -test imageBmap-3.3 {ImgBmapConfigureMaster procedure, memory de-allocation} -body { +test imageBmap-3.3 {ImgBmapConfigureModel procedure, memory de-allocation} -body { image create bitmap i1 -data $data1 -maskdata $data2 i1 configure -maskdata $data2 } -cleanup { image delete i1 } -result {} -test imageBmap-3.4 {ImgBmapConfigureMaster procedure} -body { +test imageBmap-3.4 {ImgBmapConfigureModel procedure} -body { image create bitmap i1 i1 configure -maskdata $data2 } -returnCodes error -result {can't have mask without bitmap} -test imageBmap-3.5 {ImgBmapConfigureMaster procedure} -body { +test imageBmap-3.5 {ImgBmapConfigureModel procedure} -body { image create bitmap i1 -data $data1 -maskdata { #define foo_width 8 #define foo_height 16 @@ -167,7 +167,7 @@ test imageBmap-3.5 {ImgBmapConfigureMaster procedure} -body { 0x81, 0x81, 0xff, 0xff, 0xff, 0xff, 0x81, 0x81}; } } -returnCodes error -result {bitmap and mask have different sizes} -test imageBmap-3.6 {ImgBmapConfigureMaster procedure} -body { +test imageBmap-3.6 {ImgBmapConfigureModel procedure} -body { image create bitmap i1 -data $data1 -maskdata { #define foo_width 16 #define foo_height 8 @@ -176,7 +176,7 @@ test imageBmap-3.6 {ImgBmapConfigureMaster procedure} -body { 0x81, 0x81, 0xff, 0xff, 0xff, 0xff, 0x81, 0x81}; } } -returnCodes error -result {bitmap and mask have different sizes} -test imageBmap-3.7 {ImgBmapConfigureMaster procedure} -setup { +test imageBmap-3.7 {ImgBmapConfigureModel procedure} -setup { destroy .c pack [canvas .c] } -body { diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test index 50f0688..3c4c7a5 100644 --- a/tests/imgPhoto.test +++ b/tests/imgPhoto.test @@ -131,7 +131,7 @@ test imgPhoto-2.2 {ImgPhotoCreate procedure} -setup { # set msg # } {couldn't open "bogus.img": no such file or directory} -test imgPhoto-3.1 {ImgPhotoConfigureMaster procedure} -constraints { +test imgPhoto-3.1 {ImgPhotoConfigureModel procedure} -constraints { hasTeapotPhoto } -body { image create photo photo1 -file $teapotPhotoFile @@ -139,7 +139,7 @@ test imgPhoto-3.1 {ImgPhotoConfigureMaster procedure} -constraints { } -cleanup { image delete photo1 } -result {} -test imgPhoto-3.2 {ImgPhotoConfigureMaster procedure} -constraints { +test imgPhoto-3.2 {ImgPhotoConfigureModel procedure} -constraints { hasTeapotPhoto } -body { image create photo photo1 -file $teapotPhotoFile @@ -148,7 +148,7 @@ test imgPhoto-3.2 {ImgPhotoConfigureMaster procedure} -constraints { } -cleanup { image delete photo1 } -result {1 {couldn't open "bogus": no such file or directory} 256 256} -test imgPhoto-3.3 {ImgPhotoConfigureMaster procedure} -constraints { +test imgPhoto-3.3 {ImgPhotoConfigureModel procedure} -constraints { hasTeapotPhoto } -setup { destroy .c diff --git a/tests/oldpack.test b/tests/oldpack.test index 92c411d..94e0710 100644 --- a/tests/oldpack.test +++ b/tests/oldpack.test @@ -527,20 +527,20 @@ test oldpack-9.1 {information output} -body { pack append .pack .pack.blue {top fillx frame n} \ .pack.red {bottom filly frame s} .pack.green {left fill frame w} \ .pack.violet {right expand frame e} - list [pack slaves .pack] [pack info .pack.blue] [pack info .pack.red] \ + list [pack content .pack] [pack info .pack.blue] [pack info .pack.red] \ [pack info .pack.green] [pack info .pack.violet] } -result {{.pack.blue .pack.red .pack.green .pack.violet} {-in .pack -anchor n -expand 0 -fill x -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor s -expand 0 -fill y -ipadx 0 -ipady 0 -padx 0 -pady 0 -side bottom} {-in .pack -anchor w -expand 0 -fill both -ipadx 0 -ipady 0 -padx 0 -pady 0 -side left} {-in .pack -anchor e -expand 1 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side right}} test oldpack-9.2 {information output} -body { pack append .pack .pack.blue {padx 10 frame nw} \ .pack.red {pady 20 frame ne} .pack.green {frame se} \ .pack.violet {frame sw} - list [pack slaves .pack] [pack info .pack.blue] [pack info .pack.red] \ + list [pack content .pack] [pack info .pack.blue] [pack info .pack.red] \ [pack info .pack.green] [pack info .pack.violet] } -result {{.pack.blue .pack.red .pack.green .pack.violet} {-in .pack -anchor nw -expand 0 -fill none -ipadx 0 -ipady 0 -padx 5 -pady 0 -side top} {-in .pack -anchor ne -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 10 -side top} {-in .pack -anchor se -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor sw -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top}} test oldpack-9.3 {information output} -body { pack append .pack .pack.blue {frame center} .pack.red {frame center} \ .pack.green {frame c} .pack.violet {frame c} - list [pack slaves .pack] [pack info .pack.blue] [pack info .pack.red] \ + list [pack content .pack] [pack info .pack.blue] [pack info .pack.red] \ [pack info .pack.green] [pack info .pack.violet] } -result {{.pack.blue .pack.red .pack.green .pack.violet} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top}} diff --git a/tests/pack.test b/tests/pack.test index 7b75363..4128c46 100644 --- a/tests/pack.test +++ b/tests/pack.test @@ -878,28 +878,28 @@ test pack-9.1 {window ordering} -setup { } -body { pack .pack.a .pack.b .pack.c .pack.d -side top pack .pack.a -after .pack.b - pack slaves .pack + pack content .pack } -result {.pack.b .pack.a .pack.c .pack.d} test pack-9.2 {window ordering} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { pack .pack.a .pack.b .pack.c .pack.d -side top pack .pack.a -after .pack.a - pack slaves .pack + pack content .pack } -result {.pack.a .pack.b .pack.c .pack.d} test pack-9.3 {window ordering} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { pack .pack.a .pack.b .pack.c .pack.d -side top pack .pack.a -before .pack.d - pack slaves .pack + pack content .pack } -result {.pack.b .pack.c .pack.a .pack.d} test pack-9.4 {window ordering} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { pack .pack.a .pack.b .pack.c .pack.d -side top pack .pack.d -before .pack.a - pack slaves .pack + pack content .pack } -result {.pack.d .pack.a .pack.b .pack.c} test pack-9.5 {window ordering} -setup { pack forget .pack.a .pack.b .pack.c .pack.d @@ -907,42 +907,42 @@ test pack-9.5 {window ordering} -setup { pack .pack.a .pack.b .pack.c .pack.d -side top pack propagate .pack.c 0 pack .pack.a -in .pack.c - list [pack slaves .pack] [pack slaves .pack.c] + list [pack content .pack] [pack content .pack.c] } -result {{.pack.b .pack.c .pack.d} .pack.a} test pack-9.6 {window ordering} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { pack .pack.a .pack.b .pack.c .pack.d -side top pack .pack.a -in .pack - pack slaves .pack + pack content .pack } -result {.pack.b .pack.c .pack.d .pack.a} test pack-9.7 {window ordering} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { pack .pack.a .pack.b .pack.c .pack.d -side top pack .pack.a -padx 0 - pack slaves .pack + pack content .pack } -result {.pack.a .pack.b .pack.c .pack.d} test pack-9.8 {window ordering} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { pack .pack.a .pack.b .pack.c pack .pack.d - pack slaves .pack + pack content .pack } -result {.pack.a .pack.b .pack.c .pack.d} test pack-9.9 {window ordering} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { pack .pack.a .pack.b .pack.c .pack.d pack .pack.b .pack.d .pack.c -before .pack.a - pack slaves .pack + pack content .pack } -result {.pack.b .pack.d .pack.c .pack.a} test pack-9.10 {window ordering} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { pack .pack.a .pack.b .pack.c .pack.d pack .pack.a .pack.c .pack.d .pack.b -after .pack.a - pack slaves .pack + pack content .pack } -result {.pack.a .pack.c .pack.d .pack.b} @@ -963,14 +963,14 @@ test pack-10.2 {retaining/clearing configuration state} -setup { pack .pack.a -pady 14 pack info .pack.a } -result {-in .pack -anchor n -expand 1 -fill both -ipadx 3 -ipady 4 -padx 1 -pady 14 -side bottom} -test pack-10.3 {bad -in window does not change master} -setup { +test pack-10.3 {bad -in window does not change container window} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { set result [list [winfo manager .pack.a]] catch {pack .pack.a -in .pack.a} lappend result [winfo manager .pack.a] } -result {{} {}} -test pack-10.4 {bad -in window does not change master} -setup { +test pack-10.4 {bad -in window does not change container window} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { winfo manager .pack.a @@ -1147,7 +1147,7 @@ test pack-12.4 {command options and errors} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { pack configure .pack.b .pack.c - pack slaves .pack + pack content .pack } -result {.pack.b .pack.c} test pack-12.5 {command options and errors} -setup { pack forget .pack.a .pack.b .pack.c .pack.d @@ -1311,7 +1311,7 @@ test pack-12.36 {command options and errors} -setup { } -body { pack .pack.a .pack.b .pack.c .pack.d pack forget .pack.a .pack.d - pack slaves .pack + pack content .pack } -result {.pack.b .pack.c} test pack-12.37 {command options and errors} -setup { pack forget .pack.a .pack.b .pack.c .pack.d @@ -1352,22 +1352,22 @@ test pack-12.41 {command options and errors} -setup { test pack-12.42 {command options and errors} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { - pack slaves + pack content } -returnCodes error -result {wrong # args: should be "pack option arg ?arg ...?"} test pack-12.43 {command options and errors} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { - pack slaves a b -} -returnCodes error -result {wrong # args: should be "pack slaves window"} + pack content a b +} -returnCodes error -result {wrong # args: should be "pack content window"} test pack-12.44 {command options and errors} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { - pack slaves .x + pack content .x } -returnCodes error -result {bad window path name ".x"} test pack-12.45 {command options and errors} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { - pack slaves .pack.a + pack content .pack.a } -returnCodes ok -result {} test pack-12.46 {command options and errors} -setup { pack forget .pack.a .pack.b .pack.c .pack.d @@ -1385,7 +1385,7 @@ test pack-13.1 {window deletion} -setup { update destroy .pack.d update - set result [list [pack slaves .pack] [winfo geometry .pack.a] \ + set result [list [pack content .pack] [winfo geometry .pack.a] \ [winfo geometry .pack.b] [winfo geometry .pack.c]] } -result {{.pack.right .pack.bottom .pack.a .pack.b .pack.c} 20x40+30+0 50x30+15+40 80x80+0+70} @@ -1528,7 +1528,7 @@ test pack-16.1 {geometry manager name} -setup { } -result {{} pack {}} -test pack-17.1 {PackLostSlaveProc procedure} -setup { +test pack-17.1 {PackLostContentProc procedure} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { pack .pack.a @@ -1537,7 +1537,7 @@ test pack-17.1 {PackLostSlaveProc procedure} -setup { update list [winfo manager .pack.a] [winfo geometry .pack.a] } -result {place 20x40+40+10} -test pack-17.2 {PackLostSlaveProc procedure} -setup { +test pack-17.2 {PackLostContentProc procedure} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { pack .pack.a @@ -1558,7 +1558,7 @@ if {[tk windowingsystem] == "win32"} { } } -test pack-18.1 {unmap slaves when master unmapped} -constraints { +test pack-18.1 {unmap content when container unmapped} -constraints { tempNotPc } -setup { eval destroy [winfo child .pack] @@ -1590,7 +1590,7 @@ test pack-18.1 {unmap slaves when master unmapped} -constraints { lappend result [winfo ismapped .pack.a] } -result {1 0 200 75 0 1} -test pack-18.2 {unmap slaves when master unmapped} -setup { +test pack-18.2 {unmap content when container unmapped} -setup { eval destroy [winfo child .pack] } -body { @@ -1618,7 +1618,7 @@ test pack-18.2 {unmap slaves when master unmapped} -setup { test pack-19.1 {test respect for internalborder} -setup { - catch {eval pack forget [pack slaves .pack]} + catch {eval pack forget [pack content .pack]} destroy .pack.l .pack.lf } -body { wm geometry .pack 200x200 @@ -1636,7 +1636,7 @@ test pack-19.1 {test respect for internalborder} -setup { destroy .pack.l .pack.lf } -result {196x188+2+10 177x186+5+7} test pack-19.2 {test support for minreqsize} -setup { - catch {eval pack forget [pack slaves .pack]} + catch {eval pack forget [pack content .pack]} destroy .pack.l .pack.lf } -body { wm geometry .pack {} diff --git a/tests/packgrid.test b/tests/packgrid.test index 6074ce9..6dfba25 100644 --- a/tests/packgrid.test +++ b/tests/packgrid.test @@ -10,7 +10,7 @@ eval tcltest::configure $argv tcltest::loadTestedCommands namespace import -force tcltest::* -test packgrid-1.1 {pack and grid in same master} -setup { +test packgrid-1.1 {pack and grid in same container window} -setup { grid propagate . true pack propagate . true label .p -text PACK @@ -24,7 +24,7 @@ test packgrid-1.1 {pack and grid in same master} -setup { destroy .g } -result {cannot use geometry manager pack inside . which already has slaves managed by grid} -test packgrid-1.2 {pack and grid in same master} -setup { +test packgrid-1.2 {pack and grid in same container window} -setup { grid propagate . true pack propagate . true label .p -text PACK @@ -38,7 +38,7 @@ test packgrid-1.2 {pack and grid in same master} -setup { destroy .g } -result {cannot use geometry manager grid inside . which already has slaves managed by pack} -test packgrid-1.3 {pack and grid in same master} -setup { +test packgrid-1.3 {pack and grid in same container window} -setup { grid propagate . false pack propagate . true label .p -text PACK @@ -52,7 +52,7 @@ test packgrid-1.3 {pack and grid in same master} -setup { destroy .g } -result {} -test packgrid-1.4 {pack and grid in same master} -setup { +test packgrid-1.4 {pack and grid in same container window} -setup { grid propagate . false pack propagate . true label .p -text PACK @@ -66,7 +66,7 @@ test packgrid-1.4 {pack and grid in same master} -setup { destroy .g } -result {} -test packgrid-1.5 {pack and grid in same master} -setup { +test packgrid-1.5 {pack and grid in same container window} -setup { grid propagate . true pack propagate . false label .p -text PACK @@ -80,7 +80,7 @@ test packgrid-1.5 {pack and grid in same master} -setup { destroy .g } -result {} -test packgrid-1.6 {pack and grid in same master} -setup { +test packgrid-1.6 {pack and grid in same container window} -setup { grid propagate . true pack propagate . false label .p -text PACK @@ -94,7 +94,7 @@ test packgrid-1.6 {pack and grid in same master} -setup { destroy .g } -result {} -test packgrid-1.7 {pack and grid in same master} -setup { +test packgrid-1.7 {pack and grid in same container window} -setup { grid propagate . true pack propagate . true label .p -text PACK @@ -103,13 +103,13 @@ test packgrid-1.7 {pack and grid in same master} -setup { # Basic conflict should stop widget from being handled grid .g catch { pack .p } - pack slaves . + pack content . } -cleanup { destroy .p destroy .g } -result {} -test packgrid-1.8 {pack and grid in same master} -setup { +test packgrid-1.8 {pack and grid in same container window} -setup { grid propagate . true pack propagate . true label .p -text PACK @@ -118,13 +118,13 @@ test packgrid-1.8 {pack and grid in same master} -setup { # Basic conflict should stop widget from being handled pack .p catch { grid .g } - grid slaves . + grid content . } -cleanup { destroy .p destroy .g } -result {} -test packgrid-2.1 {pack and grid in same master, change propagation} -setup { +test packgrid-2.1 {pack and grid in same container window, change propagation} -setup { grid propagate . false pack propagate . true label .p -text PACK @@ -139,7 +139,7 @@ test packgrid-2.1 {pack and grid in same master, change propagation} -setup { destroy .g } -result {cannot use geometry manager grid inside . which already has slaves managed by pack} -test packgrid-2.2 {pack and grid in same master, change propagation} -setup { +test packgrid-2.2 {pack and grid in same container window, change propagation} -setup { grid propagate . true pack propagate . false label .p -text PACK @@ -155,7 +155,7 @@ test packgrid-2.2 {pack and grid in same master, change propagation} -setup { destroy .g } -result {cannot use geometry manager pack inside . which already has slaves managed by grid} -test packgrid-2.3 {pack and grid in same master, change propagation} -setup { +test packgrid-2.3 {pack and grid in same container window, change propagation} -setup { grid propagate . false pack propagate . false label .p -text PACK @@ -172,7 +172,7 @@ test packgrid-2.3 {pack and grid in same master, change propagation} -setup { destroy .g } -result {cannot use geometry manager pack inside . which already has slaves managed by grid} -test packgrid-2.4 {pack and grid in same master, change propagation} -setup { +test packgrid-2.4 {pack and grid in same container window, change propagation} -setup { grid propagate . false pack propagate . false label .p -text PACK @@ -188,7 +188,7 @@ test packgrid-2.4 {pack and grid in same master, change propagation} -setup { destroy .g } -result {cannot use geometry manager grid inside . which already has slaves managed by pack} -test packgrid-3.1 {stealing slave} -setup { +test packgrid-3.1 {stealing content} -setup { grid propagate . true pack propagate . true label .p -text PACK @@ -202,7 +202,7 @@ test packgrid-3.1 {stealing slave} -setup { destroy .g } -result {} -test packgrid-3.2 {stealing slave} -setup { +test packgrid-3.2 {stealing content} -setup { grid propagate . true pack propagate . true label .p -text PACK @@ -216,7 +216,7 @@ test packgrid-3.2 {stealing slave} -setup { destroy .g } -result {} -test packgrid-3.3 {stealing slave} -setup { +test packgrid-3.3 {stealing content} -setup { grid propagate . true pack propagate . true label .p -text PACK @@ -231,7 +231,7 @@ test packgrid-3.3 {stealing slave} -setup { destroy .g } -result {cannot use geometry manager pack inside . which already has slaves managed by grid} -test packgrid-3.4 {stealing slave} -setup { +test packgrid-3.4 {stealing content} -setup { grid propagate . true pack propagate . true label .p -text PACK @@ -246,7 +246,7 @@ test packgrid-3.4 {stealing slave} -setup { destroy .g } -result {cannot use geometry manager grid inside . which already has slaves managed by pack} -test packgrid-4.1 {slave stolen after master destruction - bug [aa7679685e]} -setup { +test packgrid-4.1 {content stolen after container destruction - bug [aa7679685e]} -setup { frame .f button .b -text hello } -body { @@ -261,7 +261,7 @@ test packgrid-4.1 {slave stolen after master destruction - bug [aa7679685e]} -se destroy .b } -result {} -test packgrid-4.2 {slave stolen after master destruction - bug [aa7679685e]} -setup { +test packgrid-4.2 {content stolen after container destruction - bug [aa7679685e]} -setup { frame .f button .b -text hello } -body { diff --git a/tests/panedwindow.test b/tests/panedwindow.test index ee184ce..bb3a7fd 100644 --- a/tests/panedwindow.test +++ b/tests/panedwindow.test @@ -498,7 +498,7 @@ test panedwindow-6.9 {sash coord subcommand, errors} -setup { .p add [frame .p.f] list [catch {.p sash coord -1} msg] $msg \ [catch {.p sash coord 0} msg] $msg \ - [catch {.p sash coord 1} msg] $msg + [catch {.p sash coord 1} msg] $msg } -cleanup { deleteWindows } -result [list 1 "invalid sash index" 1 "invalid sash index" 1 "invalid sash index"] @@ -511,7 +511,7 @@ test panedwindow-6.10 {sash coord subcommand, errors} -setup { list [catch {.p sash coord -1} msg] $msg \ [catch {.p sash coord 0} msg] \ [catch {.p sash coord 1} msg] $msg \ - [catch {.p sash coord 2} msg] $msg + [catch {.p sash coord 2} msg] $msg } -cleanup { deleteWindows } -result [list 1 "invalid sash index" 0 1 "invalid sash index" 1 "invalid sash index"] @@ -622,7 +622,7 @@ test panedwindow-8.5 {sash dragto subcommand, errors} -setup { } -cleanup { deleteWindows } -returnCodes error -result {expected integer but got "bar"} - + test panedwindow-9.1 {sash mark/sash dragto interaction} -setup { deleteWindows @@ -925,7 +925,7 @@ test panedwindow-11.15 {moving sash into "virtual" space on last pane increases } -cleanup { deleteWindows } -result {68 100} - + test panedwindow-12.1 {horizontal panedwindow lays out widgets properly} -setup { deleteWindows @@ -1022,7 +1022,7 @@ test panedwindow-12.6 {panedwindow takes explicit widget width over reqwidth} -s } -cleanup { deleteWindows } -result [list 20 20] -test panedwindow-12.7 {horizontal panedwindow reqheight is max slave height} -setup { +test panedwindow-12.7 {horizontal panedwindow reqheight is max pane height} -setup { deleteWindows } -body { panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 4 @@ -1033,7 +1033,7 @@ test panedwindow-12.7 {horizontal panedwindow reqheight is max slave height} -se } -cleanup { deleteWindows } -result {20 40} -test panedwindow-12.8 {horizontal panedwindow reqheight is max slave height} -setup { +test panedwindow-12.8 {horizontal panedwindow reqheight is max pane height} -setup { deleteWindows } -body { panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 4 @@ -1087,7 +1087,7 @@ test panedwindow-12.11 {panedwindow takes explicit height over reqheight} -setup } -cleanup { deleteWindows } -result [list 20 20] -test panedwindow-12.12 {vertical panedwindow reqwidth is max slave width} -setup { +test panedwindow-12.12 {vertical panedwindow reqwidth is max pane width} -setup { deleteWindows } -body { panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 4 \ @@ -1099,7 +1099,7 @@ test panedwindow-12.12 {vertical panedwindow reqwidth is max slave width} -setup } -cleanup { deleteWindows } -result {20 40} -test panedwindow-12.13 {vertical panedwindow reqwidth is max slave width} -setup { +test panedwindow-12.13 {vertical panedwindow reqwidth is max pane width} -setup { deleteWindows } -body { panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 4 \ @@ -1133,7 +1133,7 @@ test panedwindow-13.1 {PanestructureProc, widget yields managements} -setup { deleteWindows } -body { # Check that the panedwindow correctly yields geometry management of - # a slave when the slave is destroyed. + # a pane when the pane is destroyed. # This test should not cause a core dump, and it should not cause # a memory leak. @@ -1144,12 +1144,12 @@ test panedwindow-13.1 {PanestructureProc, widget yields managements} -setup { destroy .b set result "" } -result {} -test panedwindow-13.2 {PanedWindowLostSlaveProc, widget yields management} -setup { +test panedwindow-13.2 {PanedWindowLostPaneProc, widget yields management} -setup { deleteWindows } -body { # Check that the paned window correctly yields geometry management of - # a slave when some other geometry manager steals the slave from us. - + # a pane when some other geometry manager steals the pane from us. + # This test should not cause a core dump, and it should not cause a # memory leak. panedwindow .p @@ -1518,9 +1518,9 @@ test panedwindow-17.1 {MoveSash, move right} -setup { # Get the requested width of the paned window lappend result [winfo reqwidth .p] - + .p sash place 0 30 0 - + # Get the reqwidth again, to make sure it hasn't changed lappend result [winfo reqwidth .p] @@ -1538,7 +1538,7 @@ test panedwindow-17.2 {MoveSash, move right (unmapped) clipped by reqwidth} -set } .p sash place 0 100 0 - + # Get the new sash coord; it should be clipped by the reqwidth of # the panedwindow. .p sash coord 0 @@ -1552,13 +1552,13 @@ test panedwindow-17.3 {MoveSash, move right (mapped, width < reqwidth) clipped b foreach w {.f1 .f2} c {red blue} { .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew } - + # Put the panedwindow up on the display and give it a width < reqwidth place .p -x 0 -y 0 -width 32 update .p sash place 0 100 0 - + # Get the new sash coord; it should be clipped by the visible width of # the panedwindow. .p sash coord 0 @@ -1572,13 +1572,13 @@ test panedwindow-17.4 {MoveSash, move right (mapped, width > reqwidth) clipped b foreach w {.f1 .f2} c {red blue} { .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew } - + # Put the panedwindow up on the display and give it a width > reqwidth place .p -x 0 -y 0 -width 102 update .p sash place 0 200 0 - + # Get the new sash coord; it should be clipped by the visible width of # the panedwindow. .p sash coord 0 @@ -1594,7 +1594,7 @@ test panedwindow-17.5 {MoveSash, move right respects minsize} -setup { } .p sash place 0 100 0 - + # Get the new sash coord; it should have moved as far as possible while # respecting minsizes. .p sash coord 0 @@ -1610,7 +1610,7 @@ test panedwindow-17.6 {MoveSash, move right respects minsize} -setup { } .p sash place 0 100 0 - + # Get the new sash coord; it should have moved as far as possible. .p sash coord 0 } -cleanup { @@ -1625,7 +1625,7 @@ test panedwindow-17.7 {MoveSash, move right pushes other sashes} -setup { } .p sash place 0 100 0 - + # Get the new sash coord; it should have moved as far as possible while # respecting minsizes. .p sash coord 1 @@ -1641,7 +1641,7 @@ test panedwindow-17.8 {MoveSash, move right pushes other sashes, respects minsiz } .p sash place 0 100 0 - + # Get the new sash coord; it should have moved as far as possible while # respecting minsizes. .p sash coord 1 @@ -1658,8 +1658,8 @@ test panedwindow-17.9 {MoveSash, move right respects minsize, exludes pad} -setu } .p sash place 0 100 0 - - # Get the new sash coord; it should have moved as far as possible, + + # Get the new sash coord; it should have moved as far as possible, # respecting minsizes. .p sash coord 0 } -cleanup { @@ -1675,8 +1675,8 @@ test panedwindow-17.10 {MoveSash, move right, negative minsize becomes 0} -setup } .p sash place 0 50 0 - - # Get the new sash coord; it should have moved as far as possible, + + # Get the new sash coord; it should have moved as far as possible, # respecting minsizes. list [.p sash coord 0] [.p sash coord 1] } -cleanup { @@ -1693,9 +1693,9 @@ test panedwindow-17.11 {MoveSash, move left} -setup { # Get the requested width of the paned window lappend result [winfo reqwidth .p] - + .p sash place 0 10 0 - + # Get the reqwidth again, to make sure it hasn't changed lappend result [winfo reqwidth .p] @@ -1713,7 +1713,7 @@ test panedwindow-17.12 {MoveSash, move left, can't move outside of window} -setu } .p sash place 0 -100 0 - + # Get the new sash coord; it should be clipped by the reqwidth of # the panedwindow. .p sash coord 0 @@ -1729,7 +1729,7 @@ test panedwindow-17.13 {MoveSash, move left respects minsize} -setup { } .p sash place 0 0 0 - + # Get the new sash coord; it should have moved as far as possible while # respecting minsizes. .p sash coord 0 @@ -1745,7 +1745,7 @@ test panedwindow-17.14 {MoveSash, move left respects minsize} -setup { } .p sash place 1 0 0 - + # Get the new sash coord; it should have moved as far as possible. .p sash coord 1 } -cleanup { @@ -1760,7 +1760,7 @@ test panedwindow-17.15 {MoveSash, move left pushes other sashes} -setup { } .p sash place 1 0 0 - + # Get the new sash coord; it should have moved as far as possible while # respecting minsizes. .p sash coord 0 @@ -1776,7 +1776,7 @@ test panedwindow-17.16 {MoveSash, move left pushes other sashes, respects minsiz } .p sash place 1 0 0 - + # Get the new sash coord; it should have moved as far as possible while # respecting minsizes. .p sash coord 0 @@ -1793,8 +1793,8 @@ test panedwindow-17.17 {MoveSash, move left respects minsize, exludes pad} -setu } .p sash place 1 0 0 - - # Get the new sash coord; it should have moved as far as possible, + + # Get the new sash coord; it should have moved as far as possible, # respecting minsizes. .p sash coord 1 } -cleanup { @@ -1810,8 +1810,8 @@ test panedwindow-17.18 {MoveSash, move left, negative minsize becomes 0} -setup } .p sash place 1 10 0 - - # Get the new sash coord; it should have moved as far as possible, + + # Get the new sash coord; it should have moved as far as possible, # respecting minsizes. list [.p sash coord 0] [.p sash coord 1] } -cleanup { @@ -1831,9 +1831,9 @@ test panedwindow-18.1 {MoveSash, move down} -setup { # Get the requested width of the paned window lappend result [winfo reqheight .p] - + .p sash place 0 0 30 - + # Get the reqwidth again, to make sure it hasn't changed lappend result [winfo reqheight .p] @@ -1852,7 +1852,7 @@ test panedwindow-18.2 {MoveSash, move down (unmapped) clipped by reqheight} -set } .p sash place 0 0 100 - + # Get the new sash coord; it should be clipped by the reqheight of # the panedwindow. .p sash coord 0 @@ -1867,13 +1867,13 @@ test panedwindow-18.3 {MoveSash, move down (mapped, height < reqheight) clipped foreach w {.f1 .f2} c {red blue} { .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew } - + # Put the panedwindow up on the display and give it a height < reqheight place .p -x 0 -y 0 -height 32 update .p sash place 0 0 100 - + # Get the new sash coord; it should be clipped by the visible height of # the panedwindow. .p sash coord 0 @@ -1888,13 +1888,13 @@ test panedwindow-18.4 {MoveSash, move down (mapped, height > reqheight) clipped foreach w {.f1 .f2} c {red blue} { .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew } - + # Put the panedwindow up on the display and give it a width > reqwidth place .p -x 0 -y 0 -height 102 update .p sash place 0 0 200 - + # Get the new sash coord; it should be clipped by the visible width of # the panedwindow. .p sash coord 0 @@ -1911,7 +1911,7 @@ test panedwindow-18.5 {MoveSash, move down respects minsize} -setup { } .p sash place 0 0 100 - + # Get the new sash coord; it should have moved as far as possible while # respecting minsizes. .p sash coord 0 @@ -1928,7 +1928,7 @@ test panedwindow-18.6 {MoveSash, move down respects minsize} -setup { } .p sash place 0 0 100 - + # Get the new sash coord; it should have moved as far as possible while # respecting minsizes. .p sash coord 0 @@ -1945,7 +1945,7 @@ test panedwindow-18.7 {MoveSash, move down pushes other sashes} -setup { } .p sash place 0 0 100 - + # Get the new sash coord; it should have moved as far as possible while # respecting minsizes. .p sash coord 1 @@ -1962,7 +1962,7 @@ test panedwindow-18.8 {MoveSash, move down pushes other sashes, respects minsize } .p sash place 0 0 100 - + # Get the new sash coord; it should have moved as far as possible while # respecting minsizes. .p sash coord 1 @@ -1980,8 +1980,8 @@ test panedwindow-18.9 {MoveSash, move down respects minsize, exludes pad} -setup } .p sash place 0 0 100 - - # Get the new sash coord; it should have moved as far as possible, + + # Get the new sash coord; it should have moved as far as possible, # respecting minsizes. .p sash coord 0 } -cleanup { @@ -1998,8 +1998,8 @@ test panedwindow-18.10 {MoveSash, move right, negative minsize becomes 0} -setup } .p sash place 0 0 50 - - # Get the new sash coord; it should have moved as far as possible, + + # Get the new sash coord; it should have moved as far as possible, # respecting minsizes. list [.p sash coord 0] [.p sash coord 1] } -cleanup { @@ -2017,9 +2017,9 @@ test panedwindow-18.11 {MoveSash, move up} -setup { # Get the requested width of the paned window lappend result [winfo reqheight .p] - + .p sash place 0 0 10 - + # Get the reqwidth again, to make sure it hasn't changed lappend result [winfo reqheight .p] @@ -2038,7 +2038,7 @@ test panedwindow-18.12 {MoveSash, move up, can't move outside of window} -setup } .p sash place 0 0 -100 - + # Get the new sash coord; it should be clipped by the reqwidth of # the panedwindow. .p sash coord 0 @@ -2055,7 +2055,7 @@ test panedwindow-18.13 {MoveSash, move up respects minsize} -setup { } .p sash place 0 0 0 - + # Get the new sash coord; it should have moved as far as possible while # respecting minsizes. .p sash coord 0 @@ -2072,7 +2072,7 @@ test panedwindow-18.14 {MoveSash, move up respects minsize} -setup { } .p sash place 1 0 0 - + # Get the new sash coord; it should have moved as far as possible. .p sash coord 1 } -cleanup { @@ -2088,7 +2088,7 @@ test panedwindow-18.15 {MoveSash, move up pushes other sashes} -setup { } .p sash place 1 0 0 - + # Get the new sash coord; it should have moved as far as possible while # respecting minsizes. .p sash coord 0 @@ -2105,7 +2105,7 @@ test panedwindow-18.16 {MoveSash, move up pushes other sashes, respects minsize} } .p sash place 1 0 0 - + # Get the new sash coord; it should have moved as far as possible while # respecting minsizes. .p sash coord 0 @@ -2123,8 +2123,8 @@ test panedwindow-18.17 {MoveSash, move up respects minsize, exludes pad} -setup } .p sash place 1 0 0 - - # Get the new sash coord; it should have moved as far as possible, + + # Get the new sash coord; it should have moved as far as possible, # respecting minsizes. .p sash coord 1 } -cleanup { @@ -2141,8 +2141,8 @@ test panedwindow-18.18 {MoveSash, move up, negative minsize becomes 0} -setup { } .p sash place 1 0 10 - - # Get the new sash coord; it should have moved as far as possible, + + # Get the new sash coord; it should have moved as far as possible, # respecting minsizes. list [.p sash coord 0] [.p sash coord 1] } -cleanup { @@ -2241,10 +2241,10 @@ test panedwindow-19.6 {ComputeGeometry, reqwidth taken from widgets} -setup { deleteWindows } -result [list [list 60 60] [list 80 60]] -test panedwindow-19.7 {ComputeGeometry, one slave, reqsize set properly} -setup { +test panedwindow-19.7 {ComputeGeometry, one pane, reqsize set properly} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 0 -sashpad 0 \ @@ -2282,7 +2282,7 @@ test panedwindow-19.9 {ComputeGeometry, sash coords} -setup { deleteWindows } -result {{20 0} {40 0}} -test panedwindow-19.10 {ComputeGeometry/ArrangePanes, slave coords} -setup { +test panedwindow-19.10 {ComputeGeometry/ArrangePanes, pane coords} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 0 \ @@ -2303,10 +2303,10 @@ test panedwindow-19.10 {ComputeGeometry/ArrangePanes, slave coords} -setup { deleteWindows } -result {{11 3 20 20} {53 3 20 20} {95 3 20 20}} -test panedwindow-19.11 {ComputeGeometry, one slave, vertical} -setup { +test panedwindow-19.11 {ComputeGeometry, one pane, vertical} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 0 -sashpad 0 \ @@ -2349,7 +2349,7 @@ test panedwindow-19.13 {ComputeGeometry, sash coords, vertical} -setup { deleteWindows } -result {{0 20} {0 40}} -test panedwindow-19.14 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup { +test panedwindow-19.14 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 0 \ @@ -2370,10 +2370,10 @@ test panedwindow-19.14 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup } -cleanup { deleteWindows } -result {{3 11 20 20} {3 53 20 20} {3 95 20 20}} -test panedwindow-19.15 {ComputeGeometry, one slave, reqsize set properly} -setup { +test panedwindow-19.15 {ComputeGeometry, one pane, reqsize set properly} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 0 -sashpad 0 \ @@ -2411,7 +2411,7 @@ test panedwindow-19.17 {ComputeGeometry, sash coords} -setup { deleteWindows } -result {{23 0} {49 0}} -test panedwindow-19.18 {ComputeGeometry/ArrangePanes, slave coords} -setup { +test panedwindow-19.18 {ComputeGeometry/ArrangePanes, pane coords} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 0 \ @@ -2432,10 +2432,10 @@ test panedwindow-19.18 {ComputeGeometry/ArrangePanes, slave coords} -setup { deleteWindows } -result {{11 3 20 20} {59 3 20 20} {107 3 20 20}} -test panedwindow-19.19 {ComputeGeometry, one slave, vertical} -setup { +test panedwindow-19.19 {ComputeGeometry, one pane, vertical} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 0 -sashpad 0 \ @@ -2478,7 +2478,7 @@ test panedwindow-19.21 {ComputeGeometry, sash coords, vertical} -setup { deleteWindows } -result {{0 23} {0 49}} -test panedwindow-19.22 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup { +test panedwindow-19.22 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 0 \ @@ -2499,10 +2499,10 @@ test panedwindow-19.22 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup } -cleanup { deleteWindows } -result {{3 11 20 20} {3 59 20 20} {3 107 20 20}} -test panedwindow-19.23 {ComputeGeometry, one slave, reqsize set properly} -setup { +test panedwindow-19.23 {ComputeGeometry, one pane, reqsize set properly} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 0 -sashpad 0 \ @@ -2540,7 +2540,7 @@ test panedwindow-19.25 {ComputeGeometry, sash coords} -setup { deleteWindows } -result {{20 0} {43 0}} -test panedwindow-19.26 {ComputeGeometry/ArrangePanes, slave coords} -setup { +test panedwindow-19.26 {ComputeGeometry/ArrangePanes, pane coords} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 0 \ @@ -2561,10 +2561,10 @@ test panedwindow-19.26 {ComputeGeometry/ArrangePanes, slave coords} -setup { deleteWindows } -result {{11 3 20 20} {56 3 20 20} {101 3 20 20}} -test panedwindow-19.27 {ComputeGeometry, one slave, vertical} -setup { +test panedwindow-19.27 {ComputeGeometry, one pane, vertical} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 0 -sashpad 0 \ @@ -2607,7 +2607,7 @@ test panedwindow-19.29 {ComputeGeometry, sash coords, vertical} -setup { deleteWindows } -result {{0 20} {0 43}} -test panedwindow-19.30 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup { +test panedwindow-19.30 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 0 \ @@ -2628,10 +2628,10 @@ test panedwindow-19.30 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup } -cleanup { deleteWindows } -result {{3 11 20 20} {3 56 20 20} {3 101 20 20}} -test panedwindow-19.31 {ComputeGeometry, one slave, reqsize set properly} -setup { +test panedwindow-19.31 {ComputeGeometry, one pane, reqsize set properly} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 0 -sashpad 0 \ @@ -2669,7 +2669,7 @@ test panedwindow-19.33 {ComputeGeometry, sash coords} -setup { deleteWindows } -result {{21 0} {47 0}} -test panedwindow-19.34 {ComputeGeometry/ArrangePanes, slave coords} -setup { +test panedwindow-19.34 {ComputeGeometry/ArrangePanes, pane coords} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 0 \ @@ -2690,10 +2690,10 @@ test panedwindow-19.34 {ComputeGeometry/ArrangePanes, slave coords} -setup { deleteWindows } -result {{11 3 20 20} {59 3 20 20} {107 3 20 20}} -test panedwindow-19.35 {ComputeGeometry, one slave, vertical} -setup { +test panedwindow-19.35 {ComputeGeometry, one pane, vertical} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 0 -sashpad 0 \ @@ -2736,7 +2736,7 @@ test panedwindow-19.37 {ComputeGeometry, sash coords, vertical} -setup { deleteWindows } -result {{0 21} {0 47}} -test panedwindow-19.38 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup { +test panedwindow-19.38 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 0 \ @@ -2757,10 +2757,10 @@ test panedwindow-19.38 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup } -cleanup { deleteWindows } -result {{3 11 20 20} {3 59 20 20} {3 107 20 20}} -test panedwindow-19.39 {ComputeGeometry, one slave, reqsize set properly} -setup { +test panedwindow-19.39 {ComputeGeometry, one pane, reqsize set properly} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 0 -sashpad 5 \ @@ -2798,7 +2798,7 @@ test panedwindow-19.41 {ComputeGeometry, sash coords} -setup { deleteWindows } -result {{25 0} {55 0}} -test panedwindow-19.42 {ComputeGeometry/ArrangePanes, slave coords} -setup { +test panedwindow-19.42 {ComputeGeometry/ArrangePanes, pane coords} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 5 \ @@ -2819,10 +2819,10 @@ test panedwindow-19.42 {ComputeGeometry/ArrangePanes, slave coords} -setup { deleteWindows } -result {{11 3 20 20} {63 3 20 20} {115 3 20 20}} -test panedwindow-19.43 {ComputeGeometry, one slave, vertical} -setup { +test panedwindow-19.43 {ComputeGeometry, one pane, vertical} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 0 -sashpad 5 \ @@ -2865,7 +2865,7 @@ test panedwindow-19.45 {ComputeGeometry, sash coords, vertical} -setup { deleteWindows } -result {{0 25} {0 55}} -test panedwindow-19.46 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup { +test panedwindow-19.46 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 5 \ @@ -2886,10 +2886,10 @@ test panedwindow-19.46 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup } -cleanup { deleteWindows } -result {{3 11 20 20} {3 63 20 20} {3 115 20 20}} -test panedwindow-19.47 {ComputeGeometry, one slave, reqsize set properly} -setup { +test panedwindow-19.47 {ComputeGeometry, one pane, reqsize set properly} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 0 -sashpad 5 \ @@ -2927,7 +2927,7 @@ test panedwindow-19.49 {ComputeGeometry, sash coords} -setup { deleteWindows } -result {{28 0} {64 0}} -test panedwindow-19.50 {ComputeGeometry/ArrangePanes, slave coords} -setup { +test panedwindow-19.50 {ComputeGeometry/ArrangePanes, pane coords} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 5 \ @@ -2948,10 +2948,10 @@ test panedwindow-19.50 {ComputeGeometry/ArrangePanes, slave coords} -setup { deleteWindows } -result {{11 3 20 20} {69 3 20 20} {127 3 20 20}} -test panedwindow-19.51 {ComputeGeometry, one slave, vertical} -setup { +test panedwindow-19.51 {ComputeGeometry, one pane, vertical} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 0 -sashpad 5 \ @@ -2994,7 +2994,7 @@ test panedwindow-19.53 {ComputeGeometry, sash coords, vertical} -setup { deleteWindows } -result {{0 28} {0 64}} -test panedwindow-19.54 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup { +test panedwindow-19.54 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 5 \ @@ -3015,10 +3015,10 @@ test panedwindow-19.54 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup } -cleanup { deleteWindows } -result {{3 11 20 20} {3 69 20 20} {3 127 20 20}} -test panedwindow-19.55 {ComputeGeometry, one slave, reqsize set properly} -setup { +test panedwindow-19.55 {ComputeGeometry, one pane, reqsize set properly} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 0 -sashpad 5 \ @@ -3056,7 +3056,7 @@ test panedwindow-19.57 {ComputeGeometry, sash coords} -setup { deleteWindows } -result {{25 0} {58 0}} -test panedwindow-19.58 {ComputeGeometry/ArrangePanes, slave coords} -setup { +test panedwindow-19.58 {ComputeGeometry/ArrangePanes, pane coords} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 5 \ @@ -3077,10 +3077,10 @@ test panedwindow-19.58 {ComputeGeometry/ArrangePanes, slave coords} -setup { deleteWindows } -result {{11 3 20 20} {66 3 20 20} {121 3 20 20}} -test panedwindow-19.59 {ComputeGeometry, one slave, vertical} -setup { +test panedwindow-19.59 {ComputeGeometry, one pane, vertical} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 0 -sashpad 5 \ @@ -3123,7 +3123,7 @@ test panedwindow-19.61 {ComputeGeometry, sash coords, vertical} -setup { deleteWindows } -result {{0 25} {0 58}} -test panedwindow-19.62 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup { +test panedwindow-19.62 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 5 \ @@ -3144,10 +3144,10 @@ test panedwindow-19.62 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup } -cleanup { deleteWindows } -result {{3 11 20 20} {3 66 20 20} {3 121 20 20}} -test panedwindow-19.63 {ComputeGeometry, one slave, reqsize set properly} -setup { +test panedwindow-19.63 {ComputeGeometry, one pane, reqsize set properly} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 0 -sashpad 5 \ @@ -3185,7 +3185,7 @@ test panedwindow-19.65 {ComputeGeometry, sash coords} -setup { deleteWindows } -result {{26 0} {62 0}} -test panedwindow-19.66 {ComputeGeometry/ArrangePanes, slave coords} -setup { +test panedwindow-19.66 {ComputeGeometry/ArrangePanes, pane coords} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 5 \ @@ -3206,10 +3206,10 @@ test panedwindow-19.66 {ComputeGeometry/ArrangePanes, slave coords} -setup { deleteWindows } -result {{11 3 20 20} {69 3 20 20} {127 3 20 20}} -test panedwindow-19.67 {ComputeGeometry, one slave, vertical} -setup { +test panedwindow-19.67 {ComputeGeometry, one pane, vertical} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 0 -sashpad 5 \ @@ -3252,7 +3252,7 @@ test panedwindow-19.69 {ComputeGeometry, sash coords, vertical} -setup { deleteWindows } -result {{0 26} {0 62}} -test panedwindow-19.70 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup { +test panedwindow-19.70 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 5 \ @@ -3273,10 +3273,10 @@ test panedwindow-19.70 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup } -cleanup { deleteWindows } -result {{3 11 20 20} {3 69 20 20} {3 127 20 20}} -test panedwindow-19.71 {ComputeGeometry, one slave, reqsize set properly} -setup { +test panedwindow-19.71 {ComputeGeometry, one pane, reqsize set properly} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 2 -sashpad 0 \ @@ -3314,7 +3314,7 @@ test panedwindow-19.73 {ComputeGeometry, sash coords} -setup { deleteWindows } -result {{22 2} {42 2}} -test panedwindow-19.74 {ComputeGeometry/ArrangePanes, slave coords} -setup { +test panedwindow-19.74 {ComputeGeometry/ArrangePanes, pane coords} -setup { deleteWindows } -body { panedwindow .p -borderwidth 2 -sashpad 0 \ @@ -3335,10 +3335,10 @@ test panedwindow-19.74 {ComputeGeometry/ArrangePanes, slave coords} -setup { deleteWindows } -result {{13 5 20 20} {55 5 20 20} {97 5 20 20}} -test panedwindow-19.75 {ComputeGeometry, one slave, vertical} -setup { +test panedwindow-19.75 {ComputeGeometry, one pane, vertical} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 2 -sashpad 0 \ @@ -3381,7 +3381,7 @@ test panedwindow-19.77 {ComputeGeometry, sash coords, vertical} -setup { deleteWindows } -result {{2 22} {2 42}} -test panedwindow-19.78 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup { +test panedwindow-19.78 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup { deleteWindows } -body { panedwindow .p -borderwidth 2 -sashpad 0 \ @@ -3402,10 +3402,10 @@ test panedwindow-19.78 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup } -cleanup { deleteWindows } -result {{5 13 20 20} {5 55 20 20} {5 97 20 20}} -test panedwindow-19.79 {ComputeGeometry, one slave, reqsize set properly} -setup { +test panedwindow-19.79 {ComputeGeometry, one pane, reqsize set properly} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 2 -sashpad 0 \ @@ -3443,7 +3443,7 @@ test panedwindow-19.81 {ComputeGeometry, sash coords} -setup { deleteWindows } -result {{25 2} {51 2}} -test panedwindow-19.82 {ComputeGeometry/ArrangePanes, slave coords} -setup { +test panedwindow-19.82 {ComputeGeometry/ArrangePanes, pane coords} -setup { deleteWindows } -body { panedwindow .p -borderwidth 2 -sashpad 0 \ @@ -3464,10 +3464,10 @@ test panedwindow-19.82 {ComputeGeometry/ArrangePanes, slave coords} -setup { deleteWindows } -result {{13 5 20 20} {61 5 20 20} {109 5 20 20}} -test panedwindow-19.83 {ComputeGeometry, one slave, vertical} -setup { +test panedwindow-19.83 {ComputeGeometry, one pane, vertical} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 2 -sashpad 0 \ @@ -3510,7 +3510,7 @@ test panedwindow-19.85 {ComputeGeometry, sash coords, vertical} -setup { deleteWindows } -result {{2 25} {2 51}} -test panedwindow-19.86 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup { +test panedwindow-19.86 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup { deleteWindows } -body { panedwindow .p -borderwidth 2 -sashpad 0 \ @@ -3531,10 +3531,10 @@ test panedwindow-19.86 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup } -cleanup { deleteWindows } -result {{5 13 20 20} {5 61 20 20} {5 109 20 20}} -test panedwindow-19.87 {ComputeGeometry, one slave, reqsize set properly} -setup { +test panedwindow-19.87 {ComputeGeometry, one pane, reqsize set properly} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 2 -sashpad 0 \ @@ -3572,7 +3572,7 @@ test panedwindow-19.89 {ComputeGeometry, sash coords} -setup { deleteWindows } -result {{22 2} {45 2}} -test panedwindow-19.90 {ComputeGeometry/ArrangePanes, slave coords} -setup { +test panedwindow-19.90 {ComputeGeometry/ArrangePanes, pane coords} -setup { deleteWindows } -body { panedwindow .p -borderwidth 2 -sashpad 0 \ @@ -3593,10 +3593,10 @@ test panedwindow-19.90 {ComputeGeometry/ArrangePanes, slave coords} -setup { deleteWindows } -result {{13 5 20 20} {58 5 20 20} {103 5 20 20}} -test panedwindow-19.91 {ComputeGeometry, one slave, vertical} -setup { +test panedwindow-19.91 {ComputeGeometry, one pane, vertical} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 2 -sashpad 0 \ @@ -3639,7 +3639,7 @@ test panedwindow-19.93 {ComputeGeometry, sash coords, vertical} -setup { deleteWindows } -result {{2 22} {2 45}} -test panedwindow-19.94 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup { +test panedwindow-19.94 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup { deleteWindows } -body { panedwindow .p -borderwidth 2 -sashpad 0 \ @@ -3660,10 +3660,10 @@ test panedwindow-19.94 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup } -cleanup { deleteWindows } -result {{5 13 20 20} {5 58 20 20} {5 103 20 20}} -test panedwindow-19.95 {ComputeGeometry, one slave, reqsize set properly} -setup { +test panedwindow-19.95 {ComputeGeometry, one pane, reqsize set properly} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 2 -sashpad 0 \ @@ -3701,7 +3701,7 @@ test panedwindow-19.97 {ComputeGeometry, sash coords} -setup { deleteWindows } -result {{23 2} {49 2}} -test panedwindow-19.98 {ComputeGeometry/ArrangePanes, slave coords} -setup { +test panedwindow-19.98 {ComputeGeometry/ArrangePanes, pane coords} -setup { deleteWindows } -body { panedwindow .p -borderwidth 2 -sashpad 0 \ @@ -3722,10 +3722,10 @@ test panedwindow-19.98 {ComputeGeometry/ArrangePanes, slave coords} -setup { deleteWindows } -result {{13 5 20 20} {61 5 20 20} {109 5 20 20}} -test panedwindow-19.99 {ComputeGeometry, one slave, vertical} -setup { +test panedwindow-19.99 {ComputeGeometry, one pane, vertical} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 2 -sashpad 0 \ @@ -3768,7 +3768,7 @@ test panedwindow-19.101 {ComputeGeometry, sash coords, vertical} -setup { deleteWindows } -result {{2 23} {2 49}} -test panedwindow-19.102 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup { +test panedwindow-19.102 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup { deleteWindows } -body { panedwindow .p -borderwidth 2 -sashpad 0 \ @@ -3789,10 +3789,10 @@ test panedwindow-19.102 {ComputeGeometry/ArrangePanes, slave coords, vert} -setu } -cleanup { deleteWindows } -result {{5 13 20 20} {5 61 20 20} {5 109 20 20}} -test panedwindow-19.103 {ComputeGeometry, one slave, reqsize set properly} -setup { +test panedwindow-19.103 {ComputeGeometry, one pane, reqsize set properly} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 2 -sashpad 5 \ @@ -3830,7 +3830,7 @@ test panedwindow-19.105 {ComputeGeometry, sash coords} -setup { deleteWindows } -result {{27 2} {57 2}} -test panedwindow-19.106 {ComputeGeometry/ArrangePanes, slave coords} -setup { +test panedwindow-19.106 {ComputeGeometry/ArrangePanes, pane coords} -setup { deleteWindows } -body { panedwindow .p -borderwidth 2 -sashpad 5 \ @@ -3851,10 +3851,10 @@ test panedwindow-19.106 {ComputeGeometry/ArrangePanes, slave coords} -setup { deleteWindows } -result {{13 5 20 20} {65 5 20 20} {117 5 20 20}} -test panedwindow-19.107 {ComputeGeometry, one slave, vertical} -setup { +test panedwindow-19.107 {ComputeGeometry, one pane, vertical} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 2 -sashpad 5 \ @@ -3897,7 +3897,7 @@ test panedwindow-19.109 {ComputeGeometry, sash coords, vertical} -setup { deleteWindows } -result {{2 27} {2 57}} -test panedwindow-19.110 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup { +test panedwindow-19.110 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup { deleteWindows } -body { panedwindow .p -borderwidth 2 -sashpad 5 \ @@ -3918,10 +3918,10 @@ test panedwindow-19.110 {ComputeGeometry/ArrangePanes, slave coords, vert} -setu } -cleanup { deleteWindows } -result {{5 13 20 20} {5 65 20 20} {5 117 20 20}} -test panedwindow-19.111 {ComputeGeometry, one slave, reqsize set properly} -setup { +test panedwindow-19.111 {ComputeGeometry, one pane, reqsize set properly} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 2 -sashpad 5 \ @@ -3959,7 +3959,7 @@ test panedwindow-19.113 {ComputeGeometry, sash coords} -setup { deleteWindows } -result {{30 2} {66 2}} -test panedwindow-19.114 {ComputeGeometry/ArrangePanes, slave coords} -setup { +test panedwindow-19.114 {ComputeGeometry/ArrangePanes, pane coords} -setup { deleteWindows } -body { panedwindow .p -borderwidth 2 -sashpad 5 \ @@ -3980,10 +3980,10 @@ test panedwindow-19.114 {ComputeGeometry/ArrangePanes, slave coords} -setup { deleteWindows } -result {{13 5 20 20} {71 5 20 20} {129 5 20 20}} -test panedwindow-19.115 {ComputeGeometry, one slave, vertical} -setup { +test panedwindow-19.115 {ComputeGeometry, one pane, vertical} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 2 -sashpad 5 \ @@ -4026,7 +4026,7 @@ test panedwindow-19.117 {ComputeGeometry, sash coords, vertical} -setup { deleteWindows } -result {{2 30} {2 66}} -test panedwindow-19.118 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup { +test panedwindow-19.118 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup { deleteWindows } -body { panedwindow .p -borderwidth 2 -sashpad 5 \ @@ -4047,10 +4047,10 @@ test panedwindow-19.118 {ComputeGeometry/ArrangePanes, slave coords, vert} -setu } -cleanup { deleteWindows } -result {{5 13 20 20} {5 71 20 20} {5 129 20 20}} -test panedwindow-19.119 {ComputeGeometry, one slave, reqsize set properly} -setup { +test panedwindow-19.119 {ComputeGeometry, one pane, reqsize set properly} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 2 -sashpad 5 \ @@ -4088,7 +4088,7 @@ test panedwindow-19.121 {ComputeGeometry, sash coords} -setup { deleteWindows } -result {{27 2} {60 2}} -test panedwindow-19.122 {ComputeGeometry/ArrangePanes, slave coords} -setup { +test panedwindow-19.122 {ComputeGeometry/ArrangePanes, pane coords} -setup { deleteWindows } -body { panedwindow .p -borderwidth 2 -sashpad 5 \ @@ -4109,10 +4109,10 @@ test panedwindow-19.122 {ComputeGeometry/ArrangePanes, slave coords} -setup { deleteWindows } -result {{13 5 20 20} {68 5 20 20} {123 5 20 20}} -test panedwindow-19.123 {ComputeGeometry, one slave, vertical} -setup { +test panedwindow-19.123 {ComputeGeometry, one pane, vertical} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 2 -sashpad 5 \ @@ -4155,7 +4155,7 @@ test panedwindow-19.125 {ComputeGeometry, sash coords, vertical} -setup { deleteWindows } -result {{2 27} {2 60}} -test panedwindow-19.126 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup { +test panedwindow-19.126 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup { deleteWindows } -body { panedwindow .p -borderwidth 2 -sashpad 5 \ @@ -4176,10 +4176,10 @@ test panedwindow-19.126 {ComputeGeometry/ArrangePanes, slave coords, vert} -setu } -cleanup { deleteWindows } -result {{5 13 20 20} {5 68 20 20} {5 123 20 20}} -test panedwindow-19.127 {ComputeGeometry, one slave, reqsize set properly} -setup { +test panedwindow-19.127 {ComputeGeometry, one pane, reqsize set properly} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 2 -sashpad 5 \ @@ -4217,7 +4217,7 @@ test panedwindow-19.129 {ComputeGeometry, sash coords} -setup { deleteWindows } -result {{28 2} {64 2}} -test panedwindow-19.130 {ComputeGeometry/ArrangePanes, slave coords} -setup { +test panedwindow-19.130 {ComputeGeometry/ArrangePanes, pane coords} -setup { deleteWindows } -body { panedwindow .p -borderwidth 2 -sashpad 5 \ @@ -4238,10 +4238,10 @@ test panedwindow-19.130 {ComputeGeometry/ArrangePanes, slave coords} -setup { deleteWindows } -result {{13 5 20 20} {71 5 20 20} {129 5 20 20}} -test panedwindow-19.131 {ComputeGeometry, one slave, vertical} -setup { +test panedwindow-19.131 {ComputeGeometry, one pane, vertical} -setup { deleteWindows } -body { - # With just one slave, sashpad and sashwidth should not + # With just one pane, sashpad and sashwidth should not # affect the panedwindow's geometry, since no sash should # ever be drawn. panedwindow .p -borderwidth 2 -sashpad 5 \ @@ -4284,7 +4284,7 @@ test panedwindow-19.133 {ComputeGeometry, sash coords, vertical} -setup { deleteWindows } -result {{2 28} {2 64}} -test panedwindow-19.134 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup { +test panedwindow-19.134 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup { deleteWindows } -body { panedwindow .p -borderwidth 2 -sashpad 5 \ @@ -4317,7 +4317,7 @@ test panedwindow-20.1 {destroyed widgets are removed from panedwindow} -setup { } -cleanup { deleteWindows } -result {} -test panedwindow-20.2 {destroyed slave causes geometry recomputation} -setup { +test panedwindow-20.2 {destroyed pane causes geometry recomputation} -setup { deleteWindows } -body { panedwindow .p -borderwidth 0 -sashpad 0 -sashwidth 2 @@ -4328,7 +4328,7 @@ test panedwindow-20.2 {destroyed slave causes geometry recomputation} -setup { } -cleanup { deleteWindows } -result 20 - + test panedwindow-21.1 {ArrangePanes, extra space is given to the last pane} -setup { deleteWindows @@ -4537,7 +4537,7 @@ test panedwindow-21.15 {ArrangePanes, last pane grows} -setup { } -result {50 150 1 1 211 50 150 1 89 300} -test panedwindow-22.1 {PanedWindowReqProc, react to slave geometry changes} -setup { +test panedwindow-22.1 {PanedWindowReqProc, react to pane geometry changes} -setup { deleteWindows } -body { # Basically just want to make sure that the PanedWindowReqProc is called @@ -4550,7 +4550,7 @@ test panedwindow-22.1 {PanedWindowReqProc, react to slave geometry changes} -set } -cleanup { deleteWindows } -result {40 80} -test panedwindow-22.2 {PanedWindowReqProc, react to slave geometry changes} -setup { +test panedwindow-22.2 {PanedWindowReqProc, react to pane geometry changes} -setup { deleteWindows } -body { panedwindow .p -orient horizontal -sashpad 0 -sashwidth 2 @@ -4824,7 +4824,7 @@ test panedwindow-23.21 {ConfigurePanes, -before, relocate existing windows} -set } -cleanup { deleteWindows } -result {.d .b .a .c} -test panedwindow-23.22 {ConfigurePanes, slave specified multiple times} -setup { +test panedwindow-23.22 {ConfigurePanes, pane specified multiple times} -setup { deleteWindows } -body { # This test should not cause a core dump @@ -4839,7 +4839,7 @@ test panedwindow-23.22 {ConfigurePanes, slave specified multiple times} -setup { } -cleanup { deleteWindows } -result {.a .b .c} -test panedwindow-23.23 {ConfigurePanes, slave specified multiple times} -setup { +test panedwindow-23.23 {ConfigurePanes, pane specified multiple times} -setup { deleteWindows } -body { # This test should not cause a core dump @@ -5146,7 +5146,7 @@ test panedwindow-25.1 {DestroyPanedWindow} -setup { } set result {} } -result {} -test panedwindow-25.2 {UnmapNotify and MapNotify events are propagated to slaves} -setup { +test panedwindow-25.2 {UnmapNotify and MapNotify events are propagated to panes} -setup { deleteWindows } -body { panedwindow .pw diff --git a/tests/place.test b/tests/place.test index e7cf5ff..d389be9 100644 --- a/tests/place.test +++ b/tests/place.test @@ -53,17 +53,17 @@ test place-1.3 {Tk_PlaceCmd procedure, "info" option} -setup { } -result {-in {.t.a b} -x 1 -relx 0.2 -y 2 -rely 0.2 -width {} -relwidth 0.3 -height 4 -relheight {} -anchor w -bordermode ignore} -test place-2.1 {ConfigureSlave procedure, -height option} -body { +test place-2.1 {ConfigureContent procedure, -height option} -body { place .t.f2 -height abcd } -returnCodes error -result {bad screen distance "abcd"} -test place-2.2 {ConfigureSlave procedure, -height option} -setup { +test place-2.2 {ConfigureContent procedure, -height option} -setup { place forget .t.f2 } -body { place .t.f2 -in .t.f -height 40 update winfo height .t.f2 } -result {40} -test place-2.3 {ConfigureSlave procedure, -height option} -setup { +test place-2.3 {ConfigureContent procedure, -height option} -setup { place forget .t.f2 } -body { place .t.f2 -in .t.f -height 120 @@ -74,17 +74,17 @@ test place-2.3 {ConfigureSlave procedure, -height option} -setup { } -result {60} -test place-3.1 {ConfigureSlave procedure, -relheight option} -body { +test place-3.1 {ConfigureContent procedure, -relheight option} -body { place .t.f2 -relheight abcd } -returnCodes error -result {expected floating-point number but got "abcd"} -test place-3.2 {ConfigureSlave procedure, -relheight option} -setup { +test place-3.2 {ConfigureContent procedure, -relheight option} -setup { place forget .t.f2 } -body { place .t.f2 -in .t.f -relheight .5 update winfo height .t.f2 } -result {40} -test place-3.3 {ConfigureSlave procedure, -relheight option} -setup { +test place-3.3 {ConfigureContent procedure, -relheight option} -setup { place forget .t.f2 } -body { place .t.f2 -in .t.f -relheight .8 @@ -95,30 +95,30 @@ test place-3.3 {ConfigureSlave procedure, -relheight option} -setup { } -result {60} -test place-4.1 {ConfigureSlave procedure, bad -in options} -setup { +test place-4.1 {ConfigureContent procedure, bad -in options} -setup { place forget .t.f2 } -body { place .t.f2 -in .t.f2 } -returnCodes error -result {can't place .t.f2 relative to itself} -test place-4.2 {ConfigureSlave procedure, bad -in option} -setup { +test place-4.2 {ConfigureContent procedure, bad -in option} -setup { place forget .t.f2 } -body { set result [list [winfo manager .t.f2]] catch {place .t.f2 -in .t.f2} lappend result [winfo manager .t.f2] } -result {{} {}} -test place-4.3 {ConfigureSlave procedure, bad -in option} -setup { +test place-4.3 {ConfigureContent procedure, bad -in option} -setup { place forget .t.f2 } -body { winfo manager .t.f2 place .t.f2 -in .t.f2 } -returnCodes error -result {can't place .t.f2 relative to itself} -test place-4.4 {ConfigureSlave procedure, bad -in option} -setup { +test place-4.4 {ConfigureContent procedure, bad -in option} -setup { place forget .t.f2 } -body { place .t.f2 -in . } -returnCodes error -result {can't place .t.f2 relative to .} -test place-4.5 {ConfigureSlave procedure, bad -in option} -setup { +test place-4.5 {ConfigureContent procedure, bad -in option} -setup { } -body { frame .t.f1 place .t.f1 -in .t.f1 @@ -139,17 +139,17 @@ test place-4.7 {prevent management loops} -setup { place .t.f3 -in .t.f1 } -returnCodes error -result {can't put .t.f3 inside .t.f1, would cause management loop} -test place-5.1 {ConfigureSlave procedure, -relwidth option} -body { +test place-5.1 {ConfigureContent procedure, -relwidth option} -body { place .t.f2 -relwidth abcd } -returnCodes error -result {expected floating-point number but got "abcd"} -test place-5.2 {ConfigureSlave procedure, -relwidth option} -setup { +test place-5.2 {ConfigureContent procedure, -relwidth option} -setup { place forget .t.f2 } -body { place .t.f2 -in .t.f -relwidth .5 update winfo width .t.f2 } -result {75} -test place-5.3 {ConfigureSlave procedure, -relwidth option} -setup { +test place-5.3 {ConfigureContent procedure, -relwidth option} -setup { place forget .t.f2 } -body { place .t.f2 -in .t.f -relwidth .8 @@ -159,17 +159,17 @@ test place-5.3 {ConfigureSlave procedure, -relwidth option} -setup { winfo width .t.f2 } -result {30} -test place-6.1 {ConfigureSlave procedure, -width option} -body { +test place-6.1 {ConfigureContent procedure, -width option} -body { place .t.f2 -width abcd } -returnCodes error -result {bad screen distance "abcd"} -test place-6.2 {ConfigureSlave procedure, -width option} -setup { +test place-6.2 {ConfigureContent procedure, -width option} -setup { place forget .t.f2 } -body { place .t.f2 -in .t.f -width 100 update winfo width .t.f2 } -result {100} -test place-6.3 {ConfigureSlave procedure, -width option} -setup { +test place-6.3 {ConfigureContent procedure, -width option} -setup { place forget .t.f2 } -body { place .t.f2 -in .t.f -width 120 @@ -267,7 +267,7 @@ if {[tk windowingsystem] == "win32"} { } } -test place-8.1 {MasterStructureProc, mapping and unmapping slaves} -setup { +test place-8.1 {PlaceStructureProc, mapping and unmapping content} -setup { place forget .t.f2 place forget .t.f } -body { @@ -283,7 +283,7 @@ test place-8.1 {MasterStructureProc, mapping and unmapping slaves} -setup { placeUpdate lappend result [winfo ismapped .t.f2] } -result {1 0 40 30 0 1} -test place-8.2 {MasterStructureProc, mapping and unmapping slaves} -setup { +test place-8.2 {PlaceStructureProc, mapping and unmapping content} -setup { place forget .t.f2 place forget .t.f update idletasks @@ -380,17 +380,17 @@ test place-9.11 {PlaceObjCmd, info errors} -setup { } -cleanup { destroy .foo } -returnCodes error -result {wrong # args: should be "place info pathName"} -test place-9.12 {PlaceObjCmd, slaves errors} -setup { +test place-9.12 {PlaceObjCmd, content errors} -setup { destroy .foo } -body { frame .foo - place slaves .foo bar + place content .foo bar } -cleanup { destroy .foo -} -returnCodes error -result {wrong # args: should be "place slaves pathName"} +} -returnCodes error -result {wrong # args: should be "place content pathName"} -test place-10.1 {ConfigureSlave} -setup { +test place-10.1 {ConfigureContent} -setup { destroy .foo } -body { frame .foo @@ -398,7 +398,7 @@ test place-10.1 {ConfigureSlave} -setup { } -cleanup { destroy .foo } -returnCodes error -result {unknown option "-badopt"} -test place-10.2 {ConfigureSlave} -setup { +test place-10.2 {ConfigureContent} -setup { destroy .foo } -body { frame .foo @@ -406,7 +406,7 @@ test place-10.2 {ConfigureSlave} -setup { } -cleanup { destroy .foo } -returnCodes error -result {value for "-anchor" missing} -test place-10.3 {ConfigureSlave} -setup { +test place-10.3 {ConfigureContent} -setup { destroy .foo } -body { frame .foo @@ -414,7 +414,7 @@ test place-10.3 {ConfigureSlave} -setup { } -cleanup { destroy .foo } -returnCodes error -result {bad bordermode "j": must be inside, outside, or ignore} -test place-10.4 {ConfigureSlave} -setup { +test place-10.4 {ConfigureContent} -setup { destroy .foo } -body { frame .foo @@ -422,23 +422,23 @@ test place-10.4 {ConfigureSlave} -setup { } -cleanup { destroy .foo } -returnCodes error -result {value for "-y" missing} - -test place-11.1 {PlaceObjCmd, slaves command} -setup { + +test place-11.1 {PlaceObjCmd, content command} -setup { destroy .foo } -body { frame .foo - place slaves .foo + place content .foo } -cleanup { destroy .foo } -result {} -test place-11.2 {PlaceObjCmd, slaves command} -setup { +test place-11.2 {PlaceObjCmd, content command} -setup { destroy .foo .bar } -body { frame .foo frame .bar place .bar -in .foo - place slaves .foo + place content .foo } -cleanup { destroy .foo .bar } -result [list .bar] @@ -500,7 +500,7 @@ test place-14.1 {memory leak testing} -constraints memory -setup { return $res } } -body { - # Test all manners of forgetting a slave + # Test all manners of forgetting content frame .f frame .f.f stress { diff --git a/tests/textIndex.test b/tests/textIndex.test index 612ade1..4db3548 100644 --- a/tests/textIndex.test +++ b/tests/textIndex.test @@ -74,7 +74,7 @@ test textIndex-1.9 {TkTextMakeByteIndex: shortcut for 0} {testtext} { testtext .t byteindex 3 80 } {3.5 5} test textIndex-1.10 {TkTextMakeByteIndex: verify index is in range} {testtext} { - # for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr) + # for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr) # one segment testtext .t byteindex 3 5 @@ -84,7 +84,7 @@ test textIndex-1.11 {TkTextMakeByteIndex: verify index is in range} {testtext} { # index += segPtr->size # Multiple segments, make sure add segment size to index. - .t mark set foo 3.2 + .t mark set foo 3.2 set x [testtext .t byteindex 3 7] .t mark unset foo set x @@ -117,7 +117,7 @@ test textIndex-1.16 {TkTextMakeByteIndex: UTF-8 characters} {testtext} { } {5.18 20} test textIndex-1.17 {TkTextMakeByteIndex: prevent splitting UTF-8 character} \ {testtext} { - # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType)) + # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType)) # Wrong answer would be \xb9 (the 2nd byte of UTF rep of 0x4e4f). set x [testtext .t byteindex 5 2] @@ -125,7 +125,7 @@ test textIndex-1.17 {TkTextMakeByteIndex: prevent splitting UTF-8 character} \ } {{5.2 4} y} test textIndex-1.18 {TkTextMakeByteIndex: prevent splitting UTF-8 character} \ {testtext} { - # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType)) + # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType)) testtext .t byteindex 5 1 .t get insert } "\u4e4f" @@ -168,7 +168,7 @@ test textIndex-2.9 {TkTextMakeCharIndex: verify index is in range} { # for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr) # Multiple segments, make sure add segment size to index. - .t mark set foo 3.2 + .t mark set foo 3.2 set x [.t index 3.7] .t mark unset foo set x @@ -439,7 +439,7 @@ test textIndex-12.5 {TkTextIndexForwChars: find index} { test textIndex-12.6 {TkTextIndexForwChars: find index} { # for ( ; segPtr != NULL; segPtr = segPtr->nextPtr) # border condition: segPtr == NULL -> beginning of next line - + .t index {2.3 + 11 chars} } 3.0 test textIndex-12.7 {TkTextIndexForwChars: find index} { @@ -458,7 +458,7 @@ test textIndex-12.9 {TkTextIndexForwChars: find index} { .t image create 2.4 -image textimage set x [.t get {2.3 + 3 chars}] .t delete 2.4 - set x + set x } "f" test textIndex-12.10 {TkTextIndexForwChars: find index} { # dstPtr->byteIndex += segPtr->size - byteOffset @@ -588,11 +588,11 @@ test textIndex-14.11 {TkTextIndexBackChars: move to previous segment} { set x } 2.9 test textIndex-14.12 {TkTextIndexBackChars: move to previous line} { - # (lineIndex == 0) + # (lineIndex == 0) .t index {1.5 - 10 chars} } 1.0 test textIndex-14.13 {TkTextIndexBackChars: move to previous line} { - # not (lineIndex == 0) + # not (lineIndex == 0) .t index {2.5 - 10 chars} } 1.2 test textIndex-14.14 {TkTextIndexBackChars: move to previous line} { @@ -812,7 +812,7 @@ test textIndex-19.12.2 {Display lines} { } {1} test textIndex-19.13 {Display lines} { - destroy {*}[pack slaves .] + destroy {*}[pack content .] text .txt -height 1 -wrap word -yscroll ".sbar set" -width 400 scrollbar .sbar -command ".txt yview" grid .txt .sbar -sticky news diff --git a/tests/textWind.test b/tests/textWind.test index e71abe6..db75c68 100644 --- a/tests/textWind.test +++ b/tests/textWind.test @@ -582,7 +582,7 @@ test textWind-6.1 {EmbWinRequestProc procedure} -setup { [list [expr {$padx+2*$fixedWidth+25}] [expr {$pady+((30-$fixedHeight)/2)}] $fixedWidth $fixedHeight]] -test textWind-7.1 {EmbWinLostSlaveProc procedure} -setup { +test textWind-7.1 {EmbWinLostContentProc procedure} -setup { .t delete 1.0 end destroy .f } -body { @@ -599,7 +599,7 @@ test textWind-7.1 {EmbWinLostSlaveProc procedure} -setup { 10x20+[expr {$padx+100}]+[expr {$pady+50}] \ [list [expr {$padx+2*$fixedWidth}] [expr {$pady+($fixedHeight/2)}] 0 0]] -test textWind-7.2 {EmbWinLostSlaveProc procedure} -setup { +test textWind-7.2 {EmbWinLostContentProc procedure} -setup { .t delete 1.0 end destroy .t.f } -body { diff --git a/tests/ttk/labelframe.test b/tests/ttk/labelframe.test index 28b4d2e..6b4761f 100644 --- a/tests/ttk/labelframe.test +++ b/tests/ttk/labelframe.test @@ -31,49 +31,49 @@ test labelframe-2.4 "Can't use nonexistent-windows as -labelwidget" -body { ### # See also series labelframe-4.x # -test labelframe-3.1 "Add child slave" -body { +test labelframe-3.1 "Add child content" -body { checkbutton .lf.cb -text "abcde" .lf configure -labelwidget .lf.cb list [update; winfo viewable .lf.cb] [winfo manager .lf.cb] } -result [list 1 labelframe] -test labelframe-3.2 "Remove child slave" -body { +test labelframe-3.2 "Remove child content" -body { .lf configure -labelwidget {} list [update; winfo viewable .lf.cb] [winfo manager .lf.cb] } -result [list 0 {}] -test labelframe-3.3 "Re-add child slave" -body { +test labelframe-3.3 "Re-add child content" -body { .lf configure -labelwidget .lf.cb list [update; winfo viewable .lf.cb] [winfo manager .lf.cb] } -result [list 1 labelframe] -test labelframe-3.4 "Re-manage child slave" -body { +test labelframe-3.4 "Re-manage child content" -body { pack .lf.cb -side right list [update; winfo viewable .lf.cb] [winfo manager .lf.cb] [.lf cget -labelwidget] } -result [list 1 pack {}] -test labelframe-3.5 "Re-add child slave" -body { +test labelframe-3.5 "Re-add child content" -body { .lf configure -labelwidget .lf.cb list [update; winfo viewable .lf.cb] [winfo manager .lf.cb] } -result [list 1 labelframe] -test labelframe-3.6 "Destroy child slave" -body { +test labelframe-3.6 "Destroy child content" -body { destroy .lf.cb .lf cget -labelwidget } -result {} ### -# Re-run series labelframe-3.x with nonchild slaves. +# Re-run series labelframe-3.x with nonchild content. # # @@@ ODDITY, 14 Nov 2005: # @@@ labelframe-4.1 fails if .cb is a [checkbutton], # @@@ but seems to succeed if it's some other widget class. # @@@ I suspect a race condition; unable to track it down ATM. # -# @@@ FOLLOWUP: This *may* have been caused by a bug in ManagerIdleProc +# @@@ FOLLOWUP: This *may* have been caused by a bug in ManagerIdleProc # @@@ (see manager.c r1.11). There's still probably a race condition in here. # -test labelframe-4.1 "Add nonchild slave" -body { +test labelframe-4.1 "Add nonchild content" -body { checkbutton .cb -text "abcde" .lf configure -labelwidget .cb update @@ -81,32 +81,32 @@ test labelframe-4.1 "Add nonchild slave" -body { } -result [list 1 1 labelframe] -test labelframe-4.2 "Remove nonchild slave" -body { +test labelframe-4.2 "Remove nonchild content" -body { .lf configure -labelwidget {} update; list [winfo ismapped .cb] [winfo viewable .cb] [winfo manager .cb] } -result [list 0 0 {}] -test labelframe-4.3 "Re-add nonchild slave" -body { +test labelframe-4.3 "Re-add nonchild content" -body { .lf configure -labelwidget .cb list [update; winfo viewable .cb] [winfo manager .cb] } -result [list 1 labelframe] -test labelframe-4.4 "Re-manage nonchild slave" -body { +test labelframe-4.4 "Re-manage nonchild content" -body { pack .cb -side right list [update; winfo viewable .cb] \ [winfo manager .cb] \ [.lf cget -labelwidget] } -result [list 1 pack {}] -test labelframe-4.5 "Re-add nonchild slave" -body { +test labelframe-4.5 "Re-add nonchild content" -body { .lf configure -labelwidget .cb list [update; winfo viewable .cb] \ [winfo manager .cb] \ [.lf cget -labelwidget] } -result [list 1 labelframe .cb] -test labelframe-4.6 "Destroy nonchild slave" -body { +test labelframe-4.6 "Destroy nonchild content" -body { destroy .cb .lf cget -labelwidget } -result {} diff --git a/tests/ttk/panedwindow.test b/tests/ttk/panedwindow.test index 7fe5c87..f72ffb8 100644 --- a/tests/ttk/panedwindow.test +++ b/tests/ttk/panedwindow.test @@ -262,7 +262,7 @@ test paned-propagation-1 "Initial request size" -body { list [winfo reqwidth .pw] [winfo reqheight .pw] } -result [list 100 105] -test paned-propagation-2 "Slave change before map" -body { +test paned-propagation-2 "Pane change before map" -body { .pw.f1 configure -width 200 -height 100 propagate-geometry list [winfo reqwidth .pw] [winfo reqheight .pw] @@ -274,13 +274,13 @@ test paned-propagation-3 "Map window" -body { list [winfo width .pw] [winfo height .pw] [.pw sashpos 0] } -result [list 200 155 100] -test paned-propagation-4 "Slave change after map, off-axis" -body { +test paned-propagation-4 "Pane change after map, off-axis" -body { .pw.f1 configure -width 100 ;# should be granted propagate-geometry list [winfo reqwidth .pw] [winfo reqheight .pw] [.pw sashpos 0] } -result [list 100 155 100] -test paned-propagation-5 "Slave change after map, on-axis" -body { +test paned-propagation-5 "Pane change after map, on-axis" -body { .pw.f1 configure -height 50 ;# should be denied propagate-geometry list [winfo reqwidth .pw] [winfo reqheight .pw] [.pw sashpos 0] diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test index 428e510..0f9033f 100644 --- a/tests/unixEmbed.test +++ b/tests/unixEmbed.test @@ -150,21 +150,21 @@ test unixEmbed-1.5a {TkpUseWindow procedure, creating Container records} -constr unix testembed } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 frame .f2 -container 1 -width 200 -height 50 pack .f1 .f2 - slave alias w winfo id .f1 - slave eval { + child alias w winfo id .f1 + child eval { destroy [winfo child .] toplevel .t -use [w] list [testembed] [expr {[lindex [lindex [testembed all] 0] 0] - [w]}] } } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {{{XXX {} {} .t}} 0} test unixEmbed-1.6 {TkpUseWindow procedure, creating Container records} -constraints { @@ -190,23 +190,23 @@ test unixEmbed-1.6a {TkpUseWindow procedure, creating Container records} -constr unix testembed } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 frame .f2 -container 1 -width 200 -height 50 pack .f1 .f2 - slave alias w1 winfo id .f1 - slave alias w2 winfo id .f2 - slave eval { + child alias w1 winfo id .f1 + child alias w2 winfo id .f2 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] toplevel .t2 -use [w2] testembed } } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {{XXX {} {} .t2} {XXX {} {} .t1}} test unixEmbed-1.7 {TkpUseWindow procedure, container and embedded in same app} -constraints { @@ -253,21 +253,21 @@ test unixEmbed-2.1a {EmbeddedEventProc procedure} -constraints { unix testembed } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 pack .f1 - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] testembed } destroy .f1 update - slave eval { + child eval { testembed } } -cleanup { @@ -295,14 +295,14 @@ test unixEmbed-2.2a {EmbeddedEventProc procedure} -constraints { unix testembed } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 pack .f1 - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] testembed @@ -310,7 +310,7 @@ test unixEmbed-2.2a {EmbeddedEventProc procedure} -constraints { testembed } } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {} test unixEmbed-2.3 {EmbeddedEventProc procedure} -constraints { @@ -361,22 +361,22 @@ test unixEmbed-3.1 {ContainerEventProc procedure, detect creation} -constraints test unixEmbed-3.1a {ContainerEventProc procedure, detect creation} -constraints { unix testembed } -setup { - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 pack .f1 - slave alias w1 winfo id .f1 + child alias w1 winfo id .f1 set x [testembed] - slave eval { + child eval { destroy [winfo child .] toplevel .t1 -use [w1] wm withdraw .t1 } list $x [testembed] } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {{{XXX .f1 {} {}}} {{XXX .f1 {} {}}}} test unixEmbed-3.2 {ContainerEventProc procedure, set size on creation} -constraints { @@ -418,14 +418,14 @@ test unixEmbed-3.3a {ContainerEventProc procedure, disallow position changes} -c unix } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 pack .f1 - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] -bd 2 -relief raised update @@ -434,7 +434,7 @@ test unixEmbed-3.3a {ContainerEventProc procedure, disallow position changes} -c wm geometry .t1 } } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {200x200+0+0} test unixEmbed-3.4 {ContainerEventProc procedure, disallow position changes} -constraints { @@ -462,14 +462,14 @@ test unixEmbed-3.4a {ContainerEventProc procedure, disallow position changes} -c unix } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 pack .f1 - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] update @@ -478,7 +478,7 @@ test unixEmbed-3.4a {ContainerEventProc procedure, disallow position changes} -c wm geometry .t1 } } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {300x100+0+0} test unixEmbed-3.5 {ContainerEventProc procedure, geometry requests} -constraints { @@ -506,22 +506,22 @@ test unixEmbed-3.5a {ContainerEventProc procedure, geometry requests} -constrain unix } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 pack .f1 - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] .t1 configure -width 300 -height 80 update } - list [winfo width .f1] [winfo height .f1] [slave eval {wm geometry .t1}] + list [winfo width .f1] [winfo height .f1] [child eval {wm geometry .t1}] } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {300 80 300x80+0+0} test unixEmbed-3.6 {ContainerEventProc procedure, map requests} -constraints { @@ -551,14 +551,14 @@ test unixEmbed-3.6a {ContainerEventProc procedure, map requests} -constraints { unix } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 pack .f1 - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] set x unmapped @@ -569,7 +569,7 @@ test unixEmbed-3.6a {ContainerEventProc procedure, map requests} -constraints { set x } } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {mapped} test unixEmbed-3.7 {ContainerEventProc procedure, destroy events} -constraints { @@ -599,16 +599,16 @@ test unixEmbed-3.7a {ContainerEventProc procedure, destroy events} -constraints unix } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 pack .f1 - slave alias w1 winfo id .f1 + child alias w1 winfo id .f1 bind .f1 <Destroy> {set x dead} set x alive - slave eval { + child eval { destroy [winfo child .] toplevel .t1 -use [w1] update @@ -617,7 +617,7 @@ test unixEmbed-3.7a {ContainerEventProc procedure, destroy events} -constraints update list $x [winfo exists .f1] } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {dead 0} @@ -648,14 +648,14 @@ test unixEmbed-4.1a {EmbedStructureProc procedure, configure events} -constraint unix } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 pack .f1 - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] update @@ -664,7 +664,7 @@ test unixEmbed-4.1a {EmbedStructureProc procedure, configure events} -constraint winfo geometry .t1 } } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {180x100+0+0} test unixEmbed-4.2 {EmbedStructureProc procedure, destroy events} -constraints { @@ -691,15 +691,15 @@ test unixEmbed-4.2a {EmbedStructureProc procedure, destroy events} -constraints unix testembed } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 pack .f1 update - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] } @@ -707,7 +707,7 @@ test unixEmbed-4.2a {EmbedStructureProc procedure, destroy events} -constraints destroy .f1 list $x [testembed] } -cleanup { - interp delete slave + interp delete child deleteWindows } -result "{{XXX .f1 {} {}}} {}" @@ -737,14 +737,14 @@ test unixEmbed-5.1a {EmbedFocusProc procedure, FocusIn events} -constraints { unix } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 pack .f1 - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] bind .t1 <FocusIn> {lappend x "focus in %W"} @@ -754,9 +754,9 @@ test unixEmbed-5.1a {EmbedFocusProc procedure, FocusIn events} -constraints { } focus -force .f1 update - slave eval {set x} + child eval {set x} } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {{focus in .t1}} test unixEmbed-5.2 {EmbedFocusProc procedure, focusing on dead window} -constraints { @@ -785,14 +785,14 @@ test unixEmbed-5.2a {EmbedFocusProc procedure, focusing on dead window} -constra unix } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 pack .f1 - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] update @@ -802,7 +802,7 @@ test unixEmbed-5.2a {EmbedFocusProc procedure, focusing on dead window} -constra focus -force .f1 update } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {} test unixEmbed-5.3 {EmbedFocusProc procedure, FocusOut events} -constraints { @@ -833,14 +833,14 @@ test unixEmbed-5.3a {EmbedFocusProc procedure, FocusOut events} -constraints { unix } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 pack .f1 - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] set x {} @@ -850,12 +850,12 @@ test unixEmbed-5.3a {EmbedFocusProc procedure, FocusOut events} -constraints { } focus -force .f1 update - set x [slave eval {update; set x }] + set x [child eval {update; set x }] focus . update - list $x [slave eval {update; set x}] + list $x [child eval {update; set x}] } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {{{focus in .t1}} {{focus in .t1} {focus out .t1}}} @@ -885,14 +885,14 @@ test unixEmbed-6.1a {EmbedGeometryRequest procedure, window changes size} -const unix } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 pack .f1 - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] update @@ -903,7 +903,7 @@ test unixEmbed-6.1a {EmbedGeometryRequest procedure, window changes size} -const list $x [winfo geom .t1] } } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {{configure .t1 300 120} 300x120+0+0} test unixEmbed-6.2 {EmbedGeometryRequest procedure, window changes size} -constraints { @@ -931,15 +931,15 @@ test unixEmbed-6.2a {EmbedGeometryRequest procedure, window changes size} -const unix } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 place .f1 -width 200 -height 200 update - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] update @@ -950,7 +950,7 @@ test unixEmbed-6.2a {EmbedGeometryRequest procedure, window changes size} -const list $x [winfo geom .t1] } } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {{configure .t1 200 200} 200x200+0+0} @@ -991,22 +991,22 @@ test unixEmbed-7.1a {TkpRedirectKeyEvent procedure, forward keystroke} -constrai unix notAqua } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { deleteWindows frame .f1 -container 1 -width 200 -height 50 pack .f1 - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] } focus -force . bind . <KeyPress> {lappend x {key %A %E}} set x {} - set y [slave eval { + set y [child eval { update bind .t1 <KeyPress> {lappend y {key %A}} set y {} @@ -1016,7 +1016,7 @@ test unixEmbed-7.1a {TkpRedirectKeyEvent procedure, forward keystroke} -constrai update list $x $y } -cleanup { - interp delete slave + interp delete child deleteWindows bind . <KeyPress> {} } -result {{{key a 1}} {}} @@ -1054,14 +1054,14 @@ test unixEmbed-7.2a {TkpRedirectKeyEvent procedure, don't forward keystroke widt unix } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 pack .f1 - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] } @@ -1070,7 +1070,7 @@ test unixEmbed-7.2a {TkpRedirectKeyEvent procedure, don't forward keystroke widt update bind . <KeyPress> {lappend x {key %A}} set x {} - set y [slave eval { + set y [child eval { update bind .t1 <KeyPress> {lappend y {key %A}} set y {} @@ -1080,7 +1080,7 @@ test unixEmbed-7.2a {TkpRedirectKeyEvent procedure, don't forward keystroke widt update list $x $y } -cleanup { - interp delete slave + interp delete child deleteWindows bind . <KeyPress> {} } -result {{} {{key b}}} @@ -1113,30 +1113,30 @@ test unixEmbed-8.1 {TkpClaimFocus procedure} -constraints { } -result {{{} .t1} .f1} test unixEmbed-8.1a {TkpClaimFocus procedure} -constraints unix -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 frame .f2 -width 200 -height 50 pack .f1 .f2 update - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] -highlightthickness 2 -bd 2 -relief sunken } # This should clear focus from the application embedded in .f1 focus -force .f2 update - list [slave eval { + list [child eval { set x [list [focus]] focus .t1 update lappend x [focus] }] [focus] } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {{{} .t1} .f1} test unixEmbed-8.2 {TkpClaimFocus procedure} -constraints unix -setup { @@ -1211,14 +1211,14 @@ test unixEmbed-9.2a {EmbedWindowDeleted procedure, check embeddedPtr} -constrain unix testembed } -setup { deleteWindows - catch {interp delete slave} - ::_test_tmp::testInterp slave - load {} Tktest slave + catch {interp delete child} + ::_test_tmp::testInterp child + load {} Tktest child } -body { frame .f1 -container 1 -width 200 -height 50 pack .f1 - slave alias w1 winfo id .f1 - slave eval { + child alias w1 winfo id .f1 + child eval { destroy [winfo child .] toplevel .t1 -use [w1] -highlightthickness 2 -bd 2 -relief sunken set x {} @@ -1227,7 +1227,7 @@ test unixEmbed-9.2a {EmbedWindowDeleted procedure, check embeddedPtr} -constrain lappend x [testembed] } } -cleanup { - interp delete slave + interp delete child deleteWindows } -result {{{XXX {} {} .t1}} {}} diff --git a/tests/unixWm.test b/tests/unixWm.test index 39a68ae..10050de 100644 --- a/tests/unixWm.test +++ b/tests/unixWm.test @@ -1298,7 +1298,7 @@ test unixWm-37.3 {Tk_WmCmd procedure, "transient" option} {unix testwrapper} { destroy .t2 set result } {{} {} .t 0 {} {}} -test unixWm-37.4 {TkWmDeadWindow, destroy on master should clear transient} {unix testwrapper} { +test unixWm-37.4 {TkWmDeadWindow, destroy on toplevel should clear transient} {unix testwrapper} { destroy .t2 toplevel .t2 destroy .t3 @@ -1309,7 +1309,7 @@ test unixWm-37.4 {TkWmDeadWindow, destroy on master should clear transient} {uni update list [wm transient .t2] [testprop [testwrapper .t2] WM_TRANSIENT_FOR] } {{} {}} -test unixWm-37.5 {Tk_WmCmd procedure, "transient" option, create master wrapper} {unix testwrapper} { +test unixWm-37.5 {Tk_WmCmd procedure, "transient" option, create toplevel wrapper} {unix testwrapper} { destroy .t2 destroy .t3 toplevel .t2 -width 120 -height 300 @@ -1840,7 +1840,7 @@ test unixWm-50.3 { Tk_CoordsToWindow procedure, finding a toplevel with embedding } tempNotWin { deleteWindows - catch {interp delete slave} + catch {interp delete child} toplevel .t -width 300 -height 400 -bg blue wm geom .t +100+100 @@ -1848,10 +1848,10 @@ test unixWm-50.3 { place .t.f -x 150 -y 50 tkwait visibility .t.f update - interp create slave - load {} Tk slave - slave alias frameid winfo id .t.f - slave eval { + interp create child + load {} Tk child + child alias frameid winfo id .t.f + child eval { wm withdraw . toplevel .x -width 100 -height 80 -use [frameid] -bg yellow tkwait visibility .x @@ -1859,9 +1859,9 @@ test unixWm-50.3 { set x [winfo rootx .x] set y [winfo rooty .x] } - set result [list [slave eval {winfo containing [expr $x - 1] [expr $y + 50]}] \ - [slave eval {winfo containing $x [expr $y + 50]}]] - interp delete slave + set result [list [child eval {winfo containing [expr $x - 1] [expr $y + 50]}] \ + [child eval {winfo containing $x [expr $y + 50]}]] + interp delete child set x [winfo rootx .t] set y [winfo rooty .t] lappend result [winfo containing [expr $x + 200] [expr $y + 49]] \ @@ -1871,17 +1871,17 @@ test unixWm-50.3 { test unixWm-50.4 {Tk_CoordsToWindow procedure, window in other application} unix { destroy .t - catch {interp delete slave} + catch {interp delete child} toplevel .t -width 200 -height 200 -bg green wm geometry .t +100+100 tkwait visibility .t update - interp create slave - load {} Tk slave - slave eval {wm geometry . 200x200+100+100; tkwait visibility . ; update} + interp create child + load {} Tk child + child eval {wm geometry . 200x200+100+100; tkwait visibility . ; update} set result [list [winfo containing 200 200] \ - [slave eval {winfo containing 200 200}]] - interp delete slave + [child eval {winfo containing 200 200}]] + interp delete child set result } {{} .} test unixWm-50.5 {Tk_CoordsToWindow procedure, handling menubars} {unix testmenubar} { diff --git a/tests/wm.test b/tests/wm.test index fac02fe..58910dd 100644 --- a/tests/wm.test +++ b/tests/wm.test @@ -1608,9 +1608,9 @@ test wm-transient-1.3 {usage} -returnCodes error -body { } -result {bad window path name "foo"} deleteWindows test wm-transient-1.4 {usage} -returnCodes error -body { - toplevel .master + toplevel .top toplevel .subject - wm transient .subject .master + wm transient .subject .top wm iconify .subject } -cleanup { deleteWindows @@ -1634,11 +1634,11 @@ test wm-transient-1.6 {usage} -returnCodes error -body { deleteWindows } -result {can't make ".icon" a master: it is an icon for .top} test wm-transient-1.7 {usage} -returnCodes error -body { - toplevel .master - wm transient .master .master + toplevel .top + wm transient .top .top } -cleanup { deleteWindows -} -result {setting ".master" as master creates a transient/master cycle} +} -result {setting ".top" as master creates a transient/master cycle} test wm-transient-1.8 {usage} -returnCodes error -body { toplevel .t1 toplevel .t2 @@ -1650,73 +1650,73 @@ test wm-transient-1.8 {usage} -returnCodes error -body { deleteWindows } -result {setting ".t3" as master creates a transient/master cycle} test wm-transient-1.9 {usage} -returnCodes error -body { - toplevel .master - frame .master.f - wm transient .master .master.f + toplevel .top + frame .top.f + wm transient .top .top.f } -cleanup { deleteWindows -} -result {setting ".master" as master creates a transient/master cycle} +} -result {setting ".top" as master creates a transient/master cycle} -test wm-transient-2.1 {basic get/set of master} -setup { +test wm-transient-2.1 {basic get/set of toplevel} -setup { set results [list] } -body { - toplevel .master + toplevel .top toplevel .subject lappend results [wm transient .subject] - wm transient .subject .master + wm transient .subject .top lappend results [wm transient .subject] wm transient .subject {} lappend results [wm transient .subject] } -cleanup { deleteWindows -} -result {{} .master {}} -test wm-transient-2.2 {first toplevel parent of non-toplevel master is used} -body { - toplevel .master - frame .master.f +} -result {{} .top {}} +test wm-transient-2.2 {first toplevel parent of non-toplevel container window is used} -body { + toplevel .top + frame .top.f toplevel .subject - wm transient .subject .master.f + wm transient .subject .top.f wm transient .subject } -cleanup { deleteWindows -} -result {.master} +} -result {.top} test wm-transient-3.1 {transient toplevel is withdrawn - when mapped if master is withdrawn} -body { - toplevel .master - wm withdraw .master + when mapped if toplevel is withdrawn} -body { + toplevel .top + wm withdraw .top update toplevel .subject - wm transient .subject .master + wm transient .subject .top update list [wm state .subject] [winfo ismapped .subject] } -cleanup { deleteWindows } -result {withdrawn 0} test wm-transient-3.2 {already mapped transient toplevel - takes on withdrawn state of master} -body { - toplevel .master - wm withdraw .master + takes on withdrawn state of toplevel} -body { + toplevel .top + wm withdraw .top update toplevel .subject update - wm transient .subject .master + wm transient .subject .top update list [wm state .subject] [winfo ismapped .subject] } -cleanup { deleteWindows } -result {withdrawn 0} -test wm-transient-3.3 {withdraw/deiconify on the master +test wm-transient-3.3 {withdraw/deiconify on the toplevel also does a withdraw/deiconify on the transient} -setup { set results [list] } -body { - toplevel .master + toplevel .top toplevel .subject update - wm transient .subject .master - wm withdraw .master + wm transient .subject .top + wm withdraw .top update lappend results [wm state .subject] [winfo ismapped .subject] - wm deiconify .master + wm deiconify .top update lappend results [wm state .subject] [winfo ismapped .subject] } -cleanup { @@ -1724,43 +1724,43 @@ test wm-transient-3.3 {withdraw/deiconify on the master } -result {withdrawn 0 normal 1} test wm-transient-4.1 {transient toplevel is withdrawn - when mapped if master is iconic} -body { - toplevel .master - wm iconify .master + when mapped if toplevel is iconic} -body { + toplevel .top + wm iconify .top update toplevel .subject - wm transient .subject .master + wm transient .subject .top update list [wm state .subject] [winfo ismapped .subject] } -cleanup { deleteWindows } -result {withdrawn 0} test wm-transient-4.2 {already mapped transient toplevel - is withdrawn if master is iconic} -body { - toplevel .master + is withdrawn if toplevel is iconic} -body { + toplevel .top raiseDelay - wm iconify .master + wm iconify .top update idletasks toplevel .subject update idletasks - wm transient .subject .master + wm transient .subject .top update idletasks list [wm state .subject] [winfo ismapped .subject] } -cleanup { deleteWindows } -result {withdrawn 0} -test wm-transient-4.3 {iconify/deiconify on the master +test wm-transient-4.3 {iconify/deiconify on the toplevel does a withdraw/deiconify on the transient} -setup { set results [list] } -body { - toplevel .master + toplevel .top toplevel .subject update idletasks - wm transient .subject .master - wm iconify .master + wm transient .subject .top + wm iconify .top update idletasks lappend results [wm state .subject] [winfo ismapped .subject] - wm deiconify .master + wm deiconify .top update idletasks lappend results [wm state .subject] [winfo ismapped .subject] } -cleanup { @@ -1771,53 +1771,53 @@ test wm-transient-5.1 {an error during transient command should not cause the map/unmap binding to be deleted} -setup { set results [list] } -body { - toplevel .master + toplevel .top toplevel .subject update - wm transient .subject .master + wm transient .subject .top # Expect a bad window path error here lappend results [catch {wm transient .subject .bad}] - wm withdraw .master + wm withdraw .top update lappend results [wm state .subject] - wm deiconify .master + wm deiconify .top update lappend results [wm state .subject] } -cleanup { deleteWindows } -result {1 withdrawn normal} -test wm-transient-5.2 {remove transient property when master +test wm-transient-5.2 {remove transient property when toplevel is destroyed} -body { - toplevel .master + toplevel .top toplevel .subject - wm transient .subject .master + wm transient .subject .top update - destroy .master + destroy .top update wm transient .subject } -cleanup { deleteWindows } -result {} test wm-transient-5.3 {remove transient property from window - that had never been mapped when master is destroyed} -body { - toplevel .master + that had never been mapped when toplevel is destroyed} -body { + toplevel .top toplevel .subject - wm transient .subject .master - destroy .master + wm transient .subject .top + destroy .top wm transient .subject } -cleanup { deleteWindows } -result {} test wm-transient-6.1 {a withdrawn transient does not track - state changes in the master} -body { - toplevel .master + state changes in the toplevel} -body { + toplevel .top toplevel .subject update - wm transient .subject .master + wm transient .subject .top wm withdraw .subject - wm withdraw .master - wm deiconify .master + wm withdraw .top + wm deiconify .top # idle handler should not map the transient update wm state .subject @@ -1825,24 +1825,24 @@ test wm-transient-6.1 {a withdrawn transient does not track deleteWindows } -result {withdrawn} test wm-transient-6.2 {a withdrawn transient does not track - state changes in the master} -setup { + state changes in the toplevel} -setup { set results [list] } -body { - toplevel .master + toplevel .top toplevel .subject update - wm transient .subject .master + wm transient .subject .top wm withdraw .subject - wm withdraw .master - wm deiconify .master + wm withdraw .top + wm deiconify .top # idle handler should not map the transient update lappend results [wm state .subject] wm deiconify .subject lappend results [wm state .subject] - wm withdraw .master + wm withdraw .top lappend results [wm state .subject] - wm deiconify .master + wm deiconify .top # idle handler should map transient update lappend results [wm state .subject] @@ -1850,15 +1850,15 @@ test wm-transient-6.2 {a withdrawn transient does not track deleteWindows } -result {withdrawn normal withdrawn normal} test wm-transient-6.3 {a withdrawn transient does not track - state changes in the master} -body { - toplevel .master + state changes in the toplevel} -body { + toplevel .top toplevel .subject update # withdraw before making window a transient wm withdraw .subject - wm transient .subject .master - wm withdraw .master - wm deiconify .master + wm transient .subject .top + wm withdraw .top + wm deiconify .top # idle handler should not map the transient update wm state .subject @@ -1866,7 +1866,7 @@ test wm-transient-6.3 {a withdrawn transient does not track deleteWindows } -result {withdrawn} -# wm-transient-7.*: See SF Tk Bug #592201 "wm transient fails with two masters" +# wm-transient-7.*: See SF Tk Bug #592201 "wm transient fails with two toplevels" # wm-transient-7.3 through 7.5 all caused panics on Unix in Tk 8.4b1. # 7.1 and 7.2 added to catch (potential) future errors. # @@ -1880,16 +1880,16 @@ test wm-transient-7.1 {Destroying transient} -body { } -cleanup { deleteWindows } -test wm-transient-7.2 {Destroying master} -body { - toplevel .t +test wm-transient-7.2 {Destroying toplevel} -body { + toplevel .top toplevel .transient - wm transient .transient .t - destroy .t + wm transient .transient .top + destroy .top wm transient .transient } -cleanup { deleteWindows } -result {} -test wm-transient-7.3 {Reassign transient, destroy old master} -body { +test wm-transient-7.3 {Reassign transient, destroy old toplevel} -body { toplevel .t1 toplevel .t2 toplevel .transient @@ -1901,7 +1901,7 @@ test wm-transient-7.3 {Reassign transient, destroy old master} -body { } -cleanup { deleteWindows } -test wm-transient-7.4 {Reassign transient, destroy new master} -body { +test wm-transient-7.4 {Reassign transient, destroy new toplevel} -body { toplevel .t1 toplevel .t2 toplevel .transient @@ -1930,8 +1930,8 @@ test wm-transient-8.1 {transient to withdrawn window, Bug 1163496} -setup { deleteWindows set result {} } -body { - # Verifies that transients stay on top of their masters, even if they were - # made transients when those masters were withdrawn. + # Verifies that transients stay on top of their toplevels, even if they were + # made transients when those toplevels were withdrawn. toplevel .t1; wm withdraw .t1; update toplevel .t2; wm transient .t2 .t1; update lappend result [winfo ismapped .t1] [winfo ismapped .t2] |