From aedf32f5b4f18c55895c5de1376d09ba4a40f9a4 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 18 Dec 2023 21:49:50 +0000 Subject: [PATCH] Make Ttk_ManagerSpec "const" --- generic/ttk/ttkFrame.c | 2 +- generic/ttk/ttkManager.c | 4 ++-- generic/ttk/ttkManager.h | 2 +- generic/ttk/ttkNotebook.c | 2 +- generic/ttk/ttkPanedwindow.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/generic/ttk/ttkFrame.c b/generic/ttk/ttkFrame.c index 8ada46197..0032f7997 100644 --- 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 index 98c527479..6988c51d6 100644 --- 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 index acb264edb..7b59807ac 100644 --- 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 index 668cdf592..4b75e19a7 100644 --- 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 index e81ddca0f..55236b276 100644 --- 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,