diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-30 21:39:46 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-30 21:39:46 (GMT) |
| commit | 8437a269e53441371324003f1efe5873aad83d80 (patch) | |
| tree | af7443fdfc27fa869f233cb533dfef5e1e669a01 | |
| parent | f0a436515e8b902ba61c47a70a6c77fd5e20ab9a (diff) | |
| parent | 2ece7fc679e05923e7cff58751cf69302a8cc82d (diff) | |
| download | tk-8437a269e53441371324003f1efe5873aad83d80.zip tk-8437a269e53441371324003f1efe5873aad83d80.tar.gz tk-8437a269e53441371324003f1efe5873aad83d80.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tkButton.c | 4 | ||||
| -rw-r--r-- | generic/ttk/ttkEntry.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkButton.c b/generic/tkButton.c index 5a6902d..c5360fa 100644 --- a/generic/tkButton.c +++ b/generic/tkButton.c @@ -303,9 +303,9 @@ static const Tk_OptionSpec checkbuttonOptionSpecs[] = { DEF_BUTTON_IMAGE, offsetof(TkButton, imagePtr), TCL_INDEX_NONE, TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_BOOLEAN, "-indicatoron", "indicatorOn", "IndicatorOn", - DEF_BUTTON_INDICATOR, TCL_INDEX_NONE, offsetof(TkButton, indicatorOn), TK_OPTION_ENUM_VAR, 0, 0}, + DEF_BUTTON_INDICATOR, TCL_INDEX_NONE, offsetof(TkButton, indicatorOn), 0, 0, 0}, {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify", - DEF_BUTTON_JUSTIFY, TCL_INDEX_NONE, offsetof(TkButton, justify), 0, 0, 0}, + DEF_BUTTON_JUSTIFY, TCL_INDEX_NONE, offsetof(TkButton, justify), TK_OPTION_ENUM_VAR, 0, 0}, {TK_OPTION_RELIEF, "-offrelief", "offRelief", "OffRelief", DEF_BUTTON_RELIEF, TCL_INDEX_NONE, offsetof(TkButton, offRelief), 0, 0, 0}, {TK_OPTION_STRING, "-offvalue", "offValue", "Value", diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c index 36baffe..fee2bc2 100644 --- a/generic/ttk/ttkEntry.c +++ b/generic/ttk/ttkEntry.c @@ -170,7 +170,7 @@ static const Tk_OptionSpec EntryOptionSpecs[] = { TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify", "left", TCL_INDEX_NONE, offsetof(Entry, entry.justify), - 0, 0, GEOMETRY_CHANGED}, + TK_OPTION_ENUM_VAR, 0, GEOMETRY_CHANGED}, {TK_OPTION_STRING, "-placeholder", "placeHolder", "PlaceHolder", NULL, offsetof(Entry, entry.placeholderObj), TCL_INDEX_NONE, TK_OPTION_NULL_OK, 0, 0}, |