diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-05-13 19:23:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-05-13 19:23:49 (GMT) |
| commit | d4e112f9176d88a5f575d565d924508e8879113f (patch) | |
| tree | 4a84d880c311996afd97085f8086bf54ac1f4fc4 /generic/ttk | |
| parent | 4e62a7b2dd7655dae65e0fe637912e870209f2c7 (diff) | |
| parent | b4fd0cbd901926eb56324d54de05aef042204384 (diff) | |
| download | tk-d4e112f9176d88a5f575d565d924508e8879113f.zip tk-d4e112f9176d88a5f575d565d924508e8879113f.tar.gz tk-d4e112f9176d88a5f575d565d924508e8879113f.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/ttk')
| -rw-r--r-- | generic/ttk/ttkNotebook.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c index 8c771ee..173eeb7 100644 --- a/generic/ttk/ttkNotebook.c +++ b/generic/ttk/ttkNotebook.c @@ -66,7 +66,7 @@ static const Tk_OptionSpec TabOptionSpecs[] = offsetof(Tab,imageObj), TCL_INDEX_NONE, TK_OPTION_NULL_OK, 0, GEOMETRY_CHANGED }, {TK_OPTION_STRING_TABLE, "-compound", "compound", "Compound", NULL, offsetof(Tab,compoundObj), TCL_INDEX_NONE, - TK_OPTION_NULL_OK,ttkCompoundStrings,GEOMETRY_CHANGED }, + TK_OPTION_NULL_OK, ttkCompoundStrings, GEOMETRY_CHANGED }, {TK_OPTION_INDEX, "-underline", "underline", "Underline", TTK_OPTION_UNDERLINE_DEF(Tab, underlineObj), GEOMETRY_CHANGED}, {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0 } @@ -178,13 +178,12 @@ static void NotebookStyleOptions( nbstyle->tabMargins = Ttk_UniformPadding(0); if ((objPtr = Ttk_QueryOption(nb->core.layout, "-tabmargins", 0)) != 0) { - Ttk_GetPaddingFromObj(NULL, nb->core.tkwin, objPtr, - &nbstyle->tabMargins); + Ttk_GetPaddingFromObj(NULL, tkwin, objPtr, &nbstyle->tabMargins); } nbstyle->padding = Ttk_UniformPadding(0); if ((objPtr = Ttk_QueryOption(nb->core.layout, "-padding", 0)) != 0) { - Ttk_GetPaddingFromObj(NULL, nb->core.tkwin, objPtr, &nbstyle->padding); + Ttk_GetPaddingFromObj(NULL, tkwin, objPtr, &nbstyle->padding); } nbstyle->minTabWidth = DEFAULT_MIN_TAB_WIDTH; @@ -422,8 +421,8 @@ static int NotebookSize(void *clientData, int *widthPtr, int *heightPtr) /* Client width/height overridable by widget options: */ - Tk_GetPixelsFromObj(NULL, nb->core.tkwin, nb->notebook.widthObj,&reqWidth); - Tk_GetPixelsFromObj(NULL, nb->core.tkwin, nb->notebook.heightObj,&reqHeight); + Tk_GetPixelsFromObj(NULL, nbwin, nb->notebook.widthObj, &reqWidth); + Tk_GetPixelsFromObj(NULL, nbwin, nb->notebook.heightObj, &reqHeight); if (reqWidth > 0) clientWidth = reqWidth; if (reqHeight > 0) |