gtk_widget_set_sensitive (GTK_WIDGET (menu_button), FALSE);
}
- g_object_notify (G_OBJECT (menu_button), "menu");
+ g_object_notify (G_OBJECT (menu_button), "popup");
g_object_notify (G_OBJECT (menu_button), "menu-model");
}
return menu_button->priv->model;
}
+static void
+set_align_widget_pointer (GtkMenuButton *menu_button,
+ GtkWidget *align_widget)
+{
+ GtkMenuButtonPrivate *priv;
+
+ priv = menu_button->priv;
+
+ if (priv->align_widget)
+ g_object_remove_weak_pointer (G_OBJECT (priv->align_widget), (gpointer *) &priv->align_widget);
+
+ priv->align_widget = align_widget;
+
+ if (align_widget)
+ g_object_add_weak_pointer (G_OBJECT (priv->align_widget), (gpointer *) &priv->align_widget);
+}
+
/**
* gtk_menu_button_set_align_widget:
* @menu_button: a #GtkMenuButton
if (priv->align_widget == align_widget)
return;
- priv->align_widget = align_widget;
-
- if (priv->align_widget)
- g_object_add_weak_pointer (G_OBJECT (priv->align_widget), (gpointer *) &priv->align_widget);
+ set_align_widget_pointer (menu_button, align_widget);
g_object_notify (G_OBJECT (menu_button), "align-widget");
}
menu_deactivate_cb,
object);
gtk_menu_detach (GTK_MENU (priv->popup));
+ priv->popup = NULL;
}
+ set_align_widget_pointer (GTK_MENU_BUTTON (object), NULL);
+
g_clear_object (&priv->model);
G_OBJECT_CLASS (gtk_menu_button_parent_class)->dispose (object);