diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-02-08 15:42:51 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-02-08 15:42:51 (GMT) |
| commit | 4f6063ece33cb66b11607d0bf4b72ca57bf680ef (patch) | |
| tree | b10c9fa2877a1813539233d6e369560ddc3cd06e /generic | |
| parent | 6eab94ca4508577b6f280ac96e55146bb790b8dc (diff) | |
| download | tk-4f6063ece33cb66b11607d0bf4b72ca57bf680ef.zip tk-4f6063ece33cb66b11607d0bf4b72ca57bf680ef.tar.gz tk-4f6063ece33cb66b11607d0bf4b72ca57bf680ef.tar.bz2 | |
More TK_OPTION_INT -> TK_OPTION_PIXELS
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/ttk/ttkClamTheme.c | 2 | ||||
| -rw-r--r-- | generic/ttk/ttkEntry.c | 6 | ||||
| -rw-r--r-- | generic/ttk/ttkNotebook.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/generic/ttk/ttkClamTheme.c b/generic/ttk/ttkClamTheme.c index 807090e..46e63f9 100644 --- a/generic/ttk/ttkClamTheme.c +++ b/generic/ttk/ttkClamTheme.c @@ -596,7 +596,7 @@ static const Ttk_ElementOptionSpec ScrollbarElementOptions[] = { offsetof(ScrollbarElement,arrowSizeObj), STR(SCROLLBAR_THICKNESS) }, { "-gripcount", TK_OPTION_PIXELS, offsetof(ScrollbarElement,gripCountObj), "5" }, - { "-sliderlength", TK_OPTION_INT, + { "-sliderlength", TK_OPTION_PIXELS, offsetof(ScrollbarElement,sliderlengthObj), "30" }, { NULL, TK_OPTION_BOOLEAN, 0, NULL } }; diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c index 66b83a2..5ba7538 100644 --- a/generic/ttk/ttkEntry.c +++ b/generic/ttk/ttkEntry.c @@ -189,7 +189,7 @@ static const Tk_OptionSpec EntryOptionSpecs[] = { {TK_OPTION_STRING, "-validatecommand", "validateCommand", "ValidateCommand", NULL, TCL_INDEX_NONE, offsetof(Entry, entry.validateCmd), TK_OPTION_NULL_OK, 0, 0}, - {TK_OPTION_INT, "-width", "width", "Width", + {TK_OPTION_PIXELS, "-width", "width", "Width", DEF_ENTRY_WIDTH, offsetof(Entry, entry.widthObj), TCL_INDEX_NONE, 0,0,GEOMETRY_CHANGED}, {TK_OPTION_STRING, "-xscrollcommand", "xScrollCommand", "ScrollCommand", @@ -2071,7 +2071,7 @@ typedef struct { static const Ttk_ElementOptionSpec TextareaElementOptions[] = { { "-font", TK_OPTION_FONT, offsetof(TextareaElement,fontObj), DEF_ENTRY_FONT }, - { "-width", TK_OPTION_INT, + { "-width", TK_OPTION_PIXELS, offsetof(TextareaElement,widthObj), "20" }, { NULL, TK_OPTION_BOOLEAN, 0, NULL } }; @@ -2089,7 +2089,7 @@ static void TextareaElementSize( (void)paddingPtr; Tk_GetFontMetrics(font, &fm); - Tcl_GetIntFromObj(NULL, textarea->widthObj, &prefWidth); + Tk_GetPixelsFromObj(NULL, tkwin, textarea->widthObj, &prefWidth); if (prefWidth <= 0) prefWidth = 1; diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c index b38aa4a..5e7c16b 100644 --- a/generic/ttk/ttkNotebook.c +++ b/generic/ttk/ttkNotebook.c @@ -109,10 +109,10 @@ typedef struct static const Tk_OptionSpec NotebookOptionSpecs[] = { - {TK_OPTION_INT, "-width", "width", "Width", "0", + {TK_OPTION_PIXELS, "-width", "width", "Width", "0", offsetof(Notebook,notebook.widthObj),TCL_INDEX_NONE, 0,0,GEOMETRY_CHANGED }, - {TK_OPTION_INT, "-height", "height", "Height", "0", + {TK_OPTION_PIXELS, "-height", "height", "Height", "0", offsetof(Notebook,notebook.heightObj),TCL_INDEX_NONE, 0,0,GEOMETRY_CHANGED }, {TK_OPTION_STRING, "-padding", "padding", "Padding", NULL, @@ -411,8 +411,8 @@ static int NotebookSize(void *clientData, int *widthPtr, int *heightPtr) /* Client width/height overridable by widget options: */ - Tcl_GetIntFromObj(NULL, nb->notebook.widthObj,&reqWidth); - Tcl_GetIntFromObj(NULL, nb->notebook.heightObj,&reqHeight); + Tk_GetPixelsFromObj(NULL, nb->core.tkwin, nb->notebook.widthObj,&reqWidth); + Tk_GetPixelsFromObj(NULL, nb->core.tkwin, nb->notebook.heightObj,&reqHeight); if (reqWidth > 0) clientWidth = reqWidth; if (reqHeight > 0) |