Merge 8.7

tcltk · Dec 18, 2023 · 594c1fd · 594c1fd
2 parents 66a0dbc + aedf32f
commit 594c1fd
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/generic/ttk/ttkFrame.c b/generic/ttk/ttkFrame.c
@@ -519,7 +519,7 @@ static void LabelRemoved(
     lframe->label.labelWidget = 0;
 }
 
-static Ttk_ManagerSpec LabelframeManagerSpec = {
+static const Ttk_ManagerSpec LabelframeManagerSpec = {
     { "labelframe", Ttk_GeometryRequestProc, Ttk_LostContentProc },
     LabelframeSize,
     LabelframePlaceContent,

diff --git a/generic/ttk/ttkManager.c b/generic/ttk/ttkManager.c
@@ -57,7 +57,7 @@ typedef struct
 
 struct TtkManager_
 {
-    Ttk_ManagerSpec	*managerSpec;
+    const Ttk_ManagerSpec	*managerSpec;
     void 		*managerData;
     Tk_Window   	window;
     unsigned		flags;
@@ -206,7 +206,7 @@ static void DeleteContent(Ttk_Content *content)
  */
 
 Ttk_Manager *Ttk_CreateManager(
-    Ttk_ManagerSpec *managerSpec, void *managerData, Tk_Window window)
+    const Ttk_ManagerSpec *managerSpec, void *managerData, Tk_Window window)
 {
     Ttk_Manager *mgr = (Ttk_Manager *)ckalloc(sizeof(*mgr));
 

diff --git a/generic/ttk/ttkManager.h b/generic/ttk/ttkManager.h
@@ -46,7 +46,7 @@ MODULE_SCOPE void Ttk_LostContentProc(void *, Tk_Window window);
  * Public API:
  */
 MODULE_SCOPE Ttk_Manager *Ttk_CreateManager(
-	Ttk_ManagerSpec *, void *managerData, Tk_Window window);
+	const Ttk_ManagerSpec *, void *managerData, Tk_Window window);
 MODULE_SCOPE void Ttk_DeleteManager(Ttk_Manager *);
 
 #define  Ttk_InsertSlave Ttk_InsertContent

diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
@@ -784,7 +784,7 @@ static int AddTab(
     return TCL_OK;
 }
 
-static Ttk_ManagerSpec NotebookManagerSpec = {
+static const Ttk_ManagerSpec NotebookManagerSpec = {
     { "notebook", Ttk_GeometryRequestProc, Ttk_LostContentProc },
     NotebookSize,
     NotebookPlaceContents,

diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c
@@ -458,7 +458,7 @@ static int PaneRequest(void *managerData, Tcl_Size index, int width, int height)
     return 1;
 }
 
-static Ttk_ManagerSpec PanedManagerSpec = {
+static const Ttk_ManagerSpec PanedManagerSpec = {
     { "panedwindow", Ttk_GeometryRequestProc, Ttk_LostContentProc },
     PanedSize,
     PanedPlaceContent,