diff options
| author | pspjuth <peter.spjuth@gmail.com> | 2009-08-19 23:01:59 (GMT) |
|---|---|---|
| committer | pspjuth <peter.spjuth@gmail.com> | 2009-08-19 23:01:59 (GMT) |
| commit | 2b61fda7660e28461b6dfe55f422c70aa390483d (patch) | |
| tree | a4c7c1cd7c558900a4ca247babd4096d872f1f42 /generic/tkInt.h | |
| parent | f4cf4a95f73b53ac9c0a6e3c93d9676d2877598e (diff) | |
| download | tk-2b61fda7660e28461b6dfe55f422c70aa390483d.zip tk-2b61fda7660e28461b6dfe55f422c70aa390483d.tar.gz tk-2b61fda7660e28461b6dfe55f422c70aa390483d.tar.bz2 | |
Give an error if grid and pack are used in the same master. [Patch 2475855]
Diffstat (limited to 'generic/tkInt.h')
| -rw-r--r-- | generic/tkInt.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index 430d51e..958695e 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: $Id: tkInt.h,v 1.106 2009/07/02 10:34:32 patthoyts Exp $ + * RCS: $Id: tkInt.h,v 1.107 2009/08/19 23:02:00 pspjuth Exp $ */ #ifndef _TKINT @@ -851,6 +851,7 @@ typedef struct TkWindow { int minReqWidth; /* Minimum requested width. */ int minReqHeight; /* Minimum requested height. */ + char *geometryMaster; } TkWindow; /* @@ -1164,6 +1165,11 @@ 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); + MODULE_SCOPE void TkEventInit(void); MODULE_SCOPE void TkRegisterObjTypes(void); MODULE_SCOPE int TkCreateMenuCmd(Tcl_Interp *interp); |