diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2014-10-26 16:23:31 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-10-29 06:49:59 -0400 |
| commit | ef22be9bb7bd50f177218ea9bb5f94d3a9298738 (patch) | |
| tree | efce88ece899eab376fa4d7805701c837247fe11 /gtk/gtkmodelbutton.c | |
| parent | 4da281d20b7a6086ee353d176566e2fa0967280a (diff) | |
| download | gtk+-ef22be9bb7bd50f177218ea9bb5f94d3a9298738.tar.gz | |
Drop GtkModelButton:has-submenu
Replace the has-submenu property with checking menu-name != NULL.
Diffstat (limited to 'gtk/gtkmodelbutton.c')
| -rw-r--r-- | gtk/gtkmodelbutton.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c index 9569fd1a8e..aa54e4d1bb 100644 --- a/gtk/gtkmodelbutton.c +++ b/gtk/gtkmodelbutton.c @@ -41,7 +41,6 @@ struct _GtkModelButton GtkWidget *image; GtkWidget *label; gboolean active; - gboolean has_submenu; gboolean centered; gboolean inverted; gboolean iconic; @@ -61,7 +60,6 @@ enum PROP_TEXT, PROP_ACTIVE, PROP_ACCEL, - PROP_HAS_SUBMENU, PROP_MENU_NAME, PROP_INVERTED, PROP_CENTERED, @@ -151,7 +149,7 @@ gtk_model_button_update_state (GtkModelButton *button) state &= ~GTK_STATE_FLAG_CHECKED; - if (button->active && !button->has_submenu) + if (button->active && !button->menu_name) state |= GTK_STATE_FLAG_CHECKED; gtk_widget_set_state_flags (GTK_WIDGET (button), state, TRUE); @@ -168,15 +166,6 @@ gtk_model_button_set_active (GtkModelButton *button, } static void -gtk_model_button_set_has_submenu (GtkModelButton *button, - gboolean has_submenu) -{ - button->has_submenu = has_submenu; - gtk_model_button_update_state (button); - gtk_widget_queue_resize (GTK_WIDGET (button)); -} - -static void gtk_model_button_set_menu_name (GtkModelButton *button, const gchar *menu_name) { @@ -282,10 +271,6 @@ gtk_model_button_set_property (GObject *object, gtk_model_button_set_accel (button, g_value_get_string (value)); break; - case PROP_HAS_SUBMENU: - gtk_model_button_set_has_submenu (button, g_value_get_boolean (value)); - break; - case PROP_MENU_NAME: gtk_model_button_set_menu_name (button, g_value_get_string (value)); break; @@ -355,7 +340,7 @@ has_sibling_with_indicator (GtkWidget *button) continue; if (!sibling->centered && - (sibling->has_submenu || sibling->role != GTK_MENU_TRACKER_ITEM_ROLE_NORMAL)) + (sibling->menu_name || sibling->role != GTK_MENU_TRACKER_ITEM_ROLE_NORMAL)) { has_indicator = TRUE; break; @@ -647,7 +632,7 @@ gtk_model_button_draw (GtkWidget *widget, width - 2 * border_width, height - 2 * border_width); - if (model_button->has_submenu) + if (model_button->menu_name) { GtkStateFlags state; @@ -758,9 +743,6 @@ gtk_model_button_class_init (GtkModelButtonClass *class) g_object_class_install_property (object_class, PROP_ACCEL, g_param_spec_string ("accel", "", "", NULL, G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (object_class, PROP_HAS_SUBMENU, - g_param_spec_boolean ("has-submenu", "", "", FALSE, - G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (object_class, PROP_MENU_NAME, g_param_spec_string ("menu-name", "", "", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); |