Merge 9.0

tcltk · Oct 1, 2024 · 9a5c966 · 9a5c966
2 parents 4374637 + df21e8d
commit 9a5c966
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
@@ -249,8 +249,8 @@ static const Tk_OptionSpec tkMenuConfigSpecs[] = {
 	offsetof(TkMenu, activeFgPtr), TCL_INDEX_NONE, 0,
 	DEF_MENU_ACTIVE_FG_MONO, 0},
     {TK_OPTION_RELIEF, "-activerelief", "activeRelief", "Relief",
-	DEF_MENU_ACTIVE_RELIEF, offsetof(TkMenu, activeReliefPtr),
-	TCL_INDEX_NONE, 0, NULL, 0},
+	DEF_MENU_ACTIVE_RELIEF, TCL_INDEX_NONE,
+	offsetof(TkMenu, activeRelief), 0, NULL, 0},
     {TK_OPTION_BORDER, "-background", "background", "Background",
 	DEF_MENU_BG_COLOR, offsetof(TkMenu, borderPtr), TCL_INDEX_NONE, 0,
 	DEF_MENU_BG_MONO, 0},

diff --git a/generic/tkMenu.h b/generic/tkMenu.h
@@ -379,7 +379,7 @@ typedef struct TkMenu {
 				/* We actually have to allocate these because
 				 * multiple menus get changed during one
 				 * ConfigureMenu call. */
-    Tcl_Obj *activeReliefPtr;	/* 3-d effect for active element. */
+    int activeRelief;	/* 3-d effect for active element. */
     Tcl_HashTable items;	/* Map: id -> entry */
     int serial;			/* Next item # for autogenerated ids */
 } TkMenu;

diff --git a/unix/tkUnixMenu.c b/unix/tkUnixMenu.c
@@ -444,7 +444,7 @@ DrawMenuEntryBackground(
 		|| (menuPtr->postedCascade != mePtr))) {
 	    relief = TK_RELIEF_FLAT;
 	} else {
-	    Tk_GetReliefFromObj(NULL, menuPtr->activeReliefPtr, &relief);
+	    relief = menuPtr->activeRelief;
 	}
 	Tk_GetPixelsFromObj(NULL, menuPtr->tkwin,
 		menuPtr->activeBorderWidthPtr, &activeBorderWidth);

diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
@@ -2944,7 +2944,7 @@ DrawMenuEntryBackground(
 		|| (menuPtr->postedCascade != mePtr))) {
 	    relief = TK_RELIEF_FLAT;
 	} else {
-	    Tk_GetReliefFromObj(NULL, menuPtr->activeReliefPtr, &relief);
+	    relief = menuPtr->activeRelief);
 	}
 	Tk_GetPixelsFromObj(NULL, menuPtr->tkwin,
 		menuPtr->activeBorderWidthPtr, &activeBorderWidth);