From 65ef495712871d6555135bc6235cadbc7bc6fca4 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Sun, 17 Jan 1999 14:52:22 +0000 Subject: [PATCH] deprecated gtk_check_menu_item_set_state, people should use Sun Jan 17 14:52:29 1999 Tim Janik * gtk/gtkcompat.h: * gtk/gtkcheckmenuitem.[hc]: deprecated gtk_check_menu_item_set_state, people should use gtk_check_menu_item_set_active instead. * gtk/testgtk.c: s/gtk_check_menu_item_set_state/gtk_check_menu_item_set_active/. --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-0 | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-2 | 10 ++++++++++ ChangeLog.pre-2-4 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ gtk/gtkcheckmenuitem.c | 13 +++++++++++-- gtk/gtkcheckmenuitem.h | 16 ++++++++-------- gtk/gtkcompat.h | 1 + gtk/testgtk.c | 4 ++-- tests/testgtk.c | 4 ++-- 12 files changed, 94 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24056fd57d..5c6ac0e5e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Sun Jan 17 14:52:29 1999 Tim Janik + + * gtk/gtkcompat.h: + * gtk/gtkcheckmenuitem.[hc]: + deprecated gtk_check_menu_item_set_state, people should use + gtk_check_menu_item_set_active instead. + + * gtk/testgtk.c: + s/gtk_check_menu_item_set_state/gtk_check_menu_item_set_active/. + Sun Jan 17 05:19:14 1999 Tim Janik * configure.in: incremented version number to 1.1.13, bin age 0, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 24056fd57d..5c6ac0e5e2 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +Sun Jan 17 14:52:29 1999 Tim Janik + + * gtk/gtkcompat.h: + * gtk/gtkcheckmenuitem.[hc]: + deprecated gtk_check_menu_item_set_state, people should use + gtk_check_menu_item_set_active instead. + + * gtk/testgtk.c: + s/gtk_check_menu_item_set_state/gtk_check_menu_item_set_active/. + Sun Jan 17 05:19:14 1999 Tim Janik * configure.in: incremented version number to 1.1.13, bin age 0, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 24056fd57d..5c6ac0e5e2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Sun Jan 17 14:52:29 1999 Tim Janik + + * gtk/gtkcompat.h: + * gtk/gtkcheckmenuitem.[hc]: + deprecated gtk_check_menu_item_set_state, people should use + gtk_check_menu_item_set_active instead. + + * gtk/testgtk.c: + s/gtk_check_menu_item_set_state/gtk_check_menu_item_set_active/. + Sun Jan 17 05:19:14 1999 Tim Janik * configure.in: incremented version number to 1.1.13, bin age 0, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 24056fd57d..5c6ac0e5e2 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +Sun Jan 17 14:52:29 1999 Tim Janik + + * gtk/gtkcompat.h: + * gtk/gtkcheckmenuitem.[hc]: + deprecated gtk_check_menu_item_set_state, people should use + gtk_check_menu_item_set_active instead. + + * gtk/testgtk.c: + s/gtk_check_menu_item_set_state/gtk_check_menu_item_set_active/. + Sun Jan 17 05:19:14 1999 Tim Janik * configure.in: incremented version number to 1.1.13, bin age 0, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 24056fd57d..5c6ac0e5e2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Sun Jan 17 14:52:29 1999 Tim Janik + + * gtk/gtkcompat.h: + * gtk/gtkcheckmenuitem.[hc]: + deprecated gtk_check_menu_item_set_state, people should use + gtk_check_menu_item_set_active instead. + + * gtk/testgtk.c: + s/gtk_check_menu_item_set_state/gtk_check_menu_item_set_active/. + Sun Jan 17 05:19:14 1999 Tim Janik * configure.in: incremented version number to 1.1.13, bin age 0, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 24056fd57d..5c6ac0e5e2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Sun Jan 17 14:52:29 1999 Tim Janik + + * gtk/gtkcompat.h: + * gtk/gtkcheckmenuitem.[hc]: + deprecated gtk_check_menu_item_set_state, people should use + gtk_check_menu_item_set_active instead. + + * gtk/testgtk.c: + s/gtk_check_menu_item_set_state/gtk_check_menu_item_set_active/. + Sun Jan 17 05:19:14 1999 Tim Janik * configure.in: incremented version number to 1.1.13, bin age 0, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 24056fd57d..5c6ac0e5e2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Sun Jan 17 14:52:29 1999 Tim Janik + + * gtk/gtkcompat.h: + * gtk/gtkcheckmenuitem.[hc]: + deprecated gtk_check_menu_item_set_state, people should use + gtk_check_menu_item_set_active instead. + + * gtk/testgtk.c: + s/gtk_check_menu_item_set_state/gtk_check_menu_item_set_active/. + Sun Jan 17 05:19:14 1999 Tim Janik * configure.in: incremented version number to 1.1.13, bin age 0, diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c index 71feaa59c4..f7563682a7 100644 --- a/gtk/gtkcheckmenuitem.c +++ b/gtk/gtkcheckmenuitem.c @@ -95,14 +95,23 @@ gtk_check_menu_item_new_with_label (const gchar *label) return check_menu_item; } -void +void /* FIXME remove gtk_check_menu_item_set_state, this function is deprecated */ gtk_check_menu_item_set_state (GtkCheckMenuItem *check_menu_item, gint state) +{ + gtk_check_menu_item_set_active (check_menu_item, state); +} + +void +gtk_check_menu_item_set_active (GtkCheckMenuItem *check_menu_item, + gboolean is_active) { g_return_if_fail (check_menu_item != NULL); g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (check_menu_item)); - if (check_menu_item->active != (state != 0)) + is_active = is_active != 0; + + if (check_menu_item->active != is_active) gtk_menu_item_activate (GTK_MENU_ITEM (check_menu_item)); } diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h index c8c7de0a2c..569bed476c 100644 --- a/gtk/gtkcheckmenuitem.h +++ b/gtk/gtkcheckmenuitem.h @@ -57,14 +57,14 @@ struct _GtkCheckMenuItemClass }; -GtkType gtk_check_menu_item_get_type (void); -GtkWidget* gtk_check_menu_item_new (void); -GtkWidget* gtk_check_menu_item_new_with_label (const gchar *label); -void gtk_check_menu_item_set_state (GtkCheckMenuItem *check_menu_item, - gint state); -void gtk_check_menu_item_set_show_toggle(GtkCheckMenuItem *menu_item, - gboolean always); -void gtk_check_menu_item_toggled (GtkCheckMenuItem *check_menu_item); +GtkType gtk_check_menu_item_get_type (void); +GtkWidget* gtk_check_menu_item_new (void); +GtkWidget* gtk_check_menu_item_new_with_label (const gchar *label); +void gtk_check_menu_item_set_active (GtkCheckMenuItem *check_menu_item, + gboolean is_active); +void gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item, + gboolean always); +void gtk_check_menu_item_toggled (GtkCheckMenuItem *check_menu_item); #ifdef __cplusplus diff --git a/gtk/gtkcompat.h b/gtk/gtkcompat.h index 983947b897..64742c093c 100644 --- a/gtk/gtkcompat.h +++ b/gtk/gtkcompat.h @@ -40,6 +40,7 @@ extern "C" { #define gtk_scale_value_width gtk_scale_get_value_width #define gtk_window_position gtk_window_set_position #define gtk_toggle_button_set_state gtk_toggle_button_set_active +#define gtk_check_menu_item_set_state gtk_check_menu_item_set_active #define gtk_style_apply_default_pixmap(s,gw,st,a,x,y,w,h) \ gtk_style_apply_default_background (s,gw,TRUE,st,a,x,y,w,h) diff --git a/gtk/testgtk.c b/gtk/testgtk.c index d45290831d..2c14f80796 100644 --- a/gtk/testgtk.c +++ b/gtk/testgtk.c @@ -99,7 +99,7 @@ build_option_menu (OptionMenuItem items[], group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menu_item)); gtk_menu_append (GTK_MENU (menu), menu_item); if (i == history) - gtk_check_menu_item_set_state (GTK_CHECK_MENU_ITEM (menu_item), TRUE); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE); gtk_widget_show (menu_item); } @@ -3479,7 +3479,7 @@ create_list (void) GTK_SIGNAL_FUNC (list_toggle_sel_mode), list); group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menu_item)); gtk_menu_append (GTK_MENU (menu), menu_item); - gtk_check_menu_item_set_state (GTK_CHECK_MENU_ITEM (menu_item), TRUE); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE); gtk_widget_show (menu_item); gtk_option_menu_set_menu (GTK_OPTION_MENU (list_omenu), menu); diff --git a/tests/testgtk.c b/tests/testgtk.c index d45290831d..2c14f80796 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -99,7 +99,7 @@ build_option_menu (OptionMenuItem items[], group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menu_item)); gtk_menu_append (GTK_MENU (menu), menu_item); if (i == history) - gtk_check_menu_item_set_state (GTK_CHECK_MENU_ITEM (menu_item), TRUE); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE); gtk_widget_show (menu_item); } @@ -3479,7 +3479,7 @@ create_list (void) GTK_SIGNAL_FUNC (list_toggle_sel_mode), list); group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menu_item)); gtk_menu_append (GTK_MENU (menu), menu_item); - gtk_check_menu_item_set_state (GTK_CHECK_MENU_ITEM (menu_item), TRUE); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE); gtk_widget_show (menu_item); gtk_option_menu_set_menu (GTK_OPTION_MENU (list_omenu), menu);