diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-12-02 18:04:20 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-12-02 18:04:20 (GMT) |
| commit | 4b317d1da523e41458088dd9a175ed9ee584ee80 (patch) | |
| tree | ab8acf7b7a969985439d4c611822e2c3262ba22a /generic | |
| parent | e6a596f33aefca5a3898aa795489f5049230202d (diff) | |
| parent | 74b884fbf87fc206c98f764ad738d43d836e3251 (diff) | |
| download | tk-4b317d1da523e41458088dd9a175ed9ee584ee80.zip tk-4b317d1da523e41458088dd9a175ed9ee584ee80.tar.gz tk-4b317d1da523e41458088dd9a175ed9ee584ee80.tar.bz2 | |
Merge 8.7. Add build with Tcl 9.1 (with TIP #626)
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkEntry.c | 6 | ||||
| -rw-r--r-- | generic/tkPlace.c | 4 | ||||
| -rw-r--r-- | generic/ttk/ttkEntry.c | 6 | ||||
| -rw-r--r-- | generic/ttk/ttkProgress.c | 2 | ||||
| -rw-r--r-- | generic/ttk/ttkScale.c | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/generic/tkEntry.c b/generic/tkEntry.c index 64a2b29..8b8e772 100644 --- a/generic/tkEntry.c +++ b/generic/tkEntry.c @@ -176,9 +176,9 @@ static const Tk_OptionSpec entryOptSpec[] = { #define DEF_SPINBOX_CMD "" -#define DEF_SPINBOX_FROM "0" -#define DEF_SPINBOX_TO "0" -#define DEF_SPINBOX_INCREMENT "1" +#define DEF_SPINBOX_FROM "0.0" +#define DEF_SPINBOX_TO "0.0" +#define DEF_SPINBOX_INCREMENT "1.0" #define DEF_SPINBOX_FORMAT "" #define DEF_SPINBOX_VALUES "" diff --git a/generic/tkPlace.c b/generic/tkPlace.c index ba1b48a..276ee13 100644 --- a/generic/tkPlace.c +++ b/generic/tkPlace.c @@ -93,9 +93,9 @@ static const Tk_OptionSpec optionSpecs[] = { {TK_OPTION_DOUBLE, "-relwidth", NULL, NULL, "", offsetof(Content, relWidthPtr), offsetof(Content, relWidth), TK_OPTION_NULL_OK, 0, 0}, - {TK_OPTION_DOUBLE, "-relx", NULL, NULL, "0", TCL_INDEX_NONE, + {TK_OPTION_DOUBLE, "-relx", NULL, NULL, "0.0", TCL_INDEX_NONE, offsetof(Content, relX), 0, 0, 0}, - {TK_OPTION_DOUBLE, "-rely", NULL, NULL, "0", TCL_INDEX_NONE, + {TK_OPTION_DOUBLE, "-rely", NULL, NULL, "0.0", TCL_INDEX_NONE, offsetof(Content, relY), 0, 0, 0}, {TK_OPTION_PIXELS, "-width", NULL, NULL, "", offsetof(Content, widthPtr), offsetof(Content, width), TK_OPTION_NULL_OK, 0, 0}, diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c index 9e4780e..4519869 100644 --- a/generic/ttk/ttkEntry.c +++ b/generic/ttk/ttkEntry.c @@ -1967,13 +1967,13 @@ static const Tk_OptionSpec SpinboxOptionSpecs[] = { 0,0,0 }, {TK_OPTION_DOUBLE, "-from", "from", "From", - "0", offsetof(Spinbox,spinbox.fromObj), TCL_INDEX_NONE, + "0.0", offsetof(Spinbox,spinbox.fromObj), TCL_INDEX_NONE, 0,0,0 }, {TK_OPTION_DOUBLE, "-to", "to", "To", - "0", offsetof(Spinbox,spinbox.toObj), TCL_INDEX_NONE, + "0.0", offsetof(Spinbox,spinbox.toObj), TCL_INDEX_NONE, 0,0,0 }, {TK_OPTION_DOUBLE, "-increment", "increment", "Increment", - "1", offsetof(Spinbox,spinbox.incrementObj), TCL_INDEX_NONE, + "1.0", offsetof(Spinbox,spinbox.incrementObj), TCL_INDEX_NONE, 0,0,0 }, {TK_OPTION_STRING, "-format", "format", "Format", "", offsetof(Spinbox, spinbox.formatObj), TCL_INDEX_NONE, diff --git a/generic/ttk/ttkProgress.c b/generic/ttk/ttkProgress.c index 09c94d6..89b3d90 100644 --- a/generic/ttk/ttkProgress.c +++ b/generic/ttk/ttkProgress.c @@ -66,7 +66,7 @@ static const Tk_OptionSpec ProgressbarOptionSpecs[] = DEF_PROGRESSBAR_LENGTH, offsetof(Progressbar,progress.lengthObj), TCL_INDEX_NONE, 0, 0, GEOMETRY_CHANGED }, {TK_OPTION_DOUBLE, "-maximum", "maximum", "Maximum", - "100", offsetof(Progressbar,progress.maximumObj), TCL_INDEX_NONE, + "100.0", offsetof(Progressbar,progress.maximumObj), TCL_INDEX_NONE, 0, 0, 0 }, {TK_OPTION_STRING_TABLE, "-mode", "mode", "ProgressMode", "determinate", offsetof(Progressbar,progress.modeObj), diff --git a/generic/ttk/ttkScale.c b/generic/ttk/ttkScale.c index 9322e76..fd1777d 100644 --- a/generic/ttk/ttkScale.c +++ b/generic/ttk/ttkScale.c @@ -63,11 +63,11 @@ static const Tk_OptionSpec ScaleOptionSpecs[] = offsetof(Scale,scale.orient), 0, ttkOrientStrings, STYLE_CHANGED }, - {TK_OPTION_DOUBLE, "-from", "from", "From", "0", + {TK_OPTION_DOUBLE, "-from", "from", "From", "0.0", offsetof(Scale,scale.fromObj), TCL_INDEX_NONE, 0, 0, 0}, {TK_OPTION_DOUBLE, "-to", "to", "To", "1.0", offsetof(Scale,scale.toObj), TCL_INDEX_NONE, 0, 0, 0}, - {TK_OPTION_DOUBLE, "-value", "value", "Value", "0", + {TK_OPTION_DOUBLE, "-value", "value", "Value", "0.0", offsetof(Scale,scale.valueObj), TCL_INDEX_NONE, 0, 0, 0}, {TK_OPTION_PIXELS, "-length", "length", "Length", DEF_SCALE_LENGTH, offsetof(Scale,scale.lengthObj), TCL_INDEX_NONE, 0, 0, |