From b78e2322a7d76c9af7fffdf7b9894755619f1b19 Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Sat, 18 Mar 2006 15:43:18 +0000 Subject: [PATCH] Constify. SVN revision: 21372 --- menus.c | 10 +++++----- menus.h | 11 ++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/menus.c b/menus.c index d9d57eb..a49df4d 100644 --- a/menus.c +++ b/menus.c @@ -14,7 +14,7 @@ #include "viewer.h" GtkWidget * -CreateBarSubMenu(GtkWidget * menu, char *szName) +CreateBarSubMenu(GtkWidget * menu, const char *szName) { GtkWidget *menuitem; GtkWidget *submenu; @@ -30,7 +30,7 @@ CreateBarSubMenu(GtkWidget * menu, char *szName) } GtkWidget * -CreateRightAlignBarSubMenu(GtkWidget * menu, char *szName) +CreateRightAlignBarSubMenu(GtkWidget * menu, const char *szName) { GtkWidget *menuitem; GtkWidget *submenu; @@ -47,8 +47,8 @@ CreateRightAlignBarSubMenu(GtkWidget * menu, char *szName) } GtkWidget * -CreateMenuItem(GtkWidget * menu, char *szName, char *szAccel, char *szTip, - GtkSignalFunc func, gpointer data) +CreateMenuItem(GtkWidget * menu, const char *szName, const char *szAccel, + const char *szTip, GtkSignalFunc func, const void *data) { GtkWidget *menuitem; @@ -56,7 +56,7 @@ CreateMenuItem(GtkWidget * menu, char *szName, char *szAccel, char *szTip, { menuitem = gtk_menu_item_new_with_label(szName); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", - GTK_SIGNAL_FUNC(func), data); + GTK_SIGNAL_FUNC(func), (gpointer) data); } else { diff --git a/menus.h b/menus.h index d84849b..2a32ade 100644 --- a/menus.h +++ b/menus.h @@ -1,5 +1,6 @@ -GtkWidget *CreateBarSubMenu(GtkWidget * menu, char *szName); -GtkWidget *CreateRightAlignBarSubMenu(GtkWidget * menu, char *szName); -GtkWidget *CreateMenuItem(GtkWidget * menu, char *szName, - char *szAccel, char *szTip, - GtkSignalFunc func, gpointer data); +GtkWidget *CreateBarSubMenu(GtkWidget * menu, const char *szName); +GtkWidget *CreateRightAlignBarSubMenu(GtkWidget * menu, + const char *szName); +GtkWidget *CreateMenuItem(GtkWidget * menu, const char *szName, + const char *szAccel, const char *szTip, + GtkSignalFunc func, const void *data);