Skip to content

Commit

Permalink
Complete [29ba539501] fix for "text"
Browse files Browse the repository at this point in the history
  • Loading branch information
jan.nijtmans committed Oct 8, 2024
2 parents 2e6f1df + c09721f commit b41e497
Show file tree
Hide file tree
Showing 14 changed files with 340 additions and 313 deletions.
2 changes: 1 addition & 1 deletion generic/tkButton.c
Original file line number Diff line number Diff line change
Expand Up @@ -1181,7 +1181,7 @@ ConfigureButton(
* selected.
*/

if ((butPtr->type == TYPE_RADIO_BUTTON) &&
if ((butPtr->type == TYPE_RADIO_BUTTON) &&
(*Tcl_GetString(butPtr->onValuePtr) == '\0')) {
butPtr->flags |= SELECTED;
}
Expand Down
2 changes: 1 addition & 1 deletion generic/tkButton.h
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ MODULE_SCOPE void TkButtonWorldChanged(void *instanceData);
MODULE_SCOPE void TkpComputeButtonGeometry(TkButton *butPtr);
MODULE_SCOPE TkButton *TkpCreateButton(Tk_Window tkwin);
#ifndef TkpDestroyButton
MODULE_SCOPE void TkpDestroyButton(TkButton *butPtr);
MODULE_SCOPE void TkpDestroyButton(TkButton *butPtr);
#endif
#ifndef TkpDisplayButton
MODULE_SCOPE void TkpDisplayButton(void *clientData);
Expand Down
4 changes: 2 additions & 2 deletions generic/tkConfig.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ typedef struct TkOption {
const Tk_OptionSpec *specPtr;
/* The original spec from the template passed
* to Tk_CreateOptionTable.*/
Tk_Uid dbNameUID; /* The Uid form of the option database
Tk_Uid dbNameUID; /* The Uid form of the option database
* name. */
Tk_Uid dbClassUID; /* The Uid form of the option database class
* name. */
Expand Down Expand Up @@ -1397,7 +1397,7 @@ int
Tk_SetOptions(
Tcl_Interp *interp, /* Interpreter for error reporting. If NULL,
* then no error message is returned.*/
void *recordPtr, /* The record to configure. */
void *recordPtr, /* The record to configure. */
Tk_OptionTable optionTable, /* Describes valid options. */
Tcl_Size objc, /* The number of elements in objv. */
Tcl_Obj *const objv[], /* Contains one or more name-value pairs. */
Expand Down
2 changes: 1 addition & 1 deletion generic/tkMenubutton.c
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ ConfigureMenuButton(
}
if (padY < 0) {
padY = 0;
Tcl_DecrRefCount(mbPtr->padYObj);
Tcl_DecrRefCount(mbPtr->padYObj);
mbPtr->padYObj = Tcl_NewIntObj(0);
Tcl_IncrRefCount(mbPtr->padYObj);
}
Expand Down
20 changes: 10 additions & 10 deletions generic/tkMenubutton.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,15 @@ typedef struct {
* whether the menubutton should show both an
* image and text, and, if so, how. */
enum direction direction; /* Direction for where to pop the menu. Valid
* directions are "above", "below", "flush",
* "left", and "right". "above" and "below"
* will attempt to pop the menu completely
* above or below the menu respectively.
* "flush" means that the upper left corner
* of the menubutton is where the menu pops up.
* "left" and "right" will pop the menu left
* or right, and the active item will be next
* to the button. */
* directions are "above", "below", "flush",
* "left", and "right". "above" and "below"
* will attempt to pop the menu completely
* above or below the menu respectively.
* "flush" means that the upper left corner
* of the menubutton is where the menu pops up.
* "left" and "right" will pop the menu left
* or right, and the active item will be next
* to the button. */
Tk_Cursor cursor; /* Current cursor for window, or NULL. */
Tcl_Obj *takeFocusObj; /* Value of -takefocus option; not used in the
* C code, but used by keyboard traversal
Expand Down Expand Up @@ -208,7 +208,7 @@ typedef struct {
MODULE_SCOPE void TkpComputeMenuButtonGeometry(TkMenuButton *mbPtr);
MODULE_SCOPE TkMenuButton *TkpCreateMenuButton(Tk_Window tkwin);
MODULE_SCOPE void TkpDisplayMenuButton(void *clientData);
MODULE_SCOPE void TkpDestroyMenuButton(TkMenuButton *mbPtr);
MODULE_SCOPE void TkpDestroyMenuButton(TkMenuButton *mbPtr);
MODULE_SCOPE void TkMenuButtonWorldChanged(void *instanceData);

#endif /* _TKMENUBUTTON */
Loading

0 comments on commit b41e497

Please sign in to comment.