@@ -276,6 +276,25 @@ gtk_mode_button_append (GtkModeButton *mode_button, GtkWidget *widget) return priv->n_children++; } +gint +gtk_mode_button_append_button (GtkModeButton *mode_button, GtkWidget *button) +{ + gint ret; + GtkWidget *btnchild; + + g_return_val_if_fail (GTK_IS_BUTTON(button), -1); + btnchild = gtk_bin_get_child (GTK_BIN (button)); + /* ref the child so it stays alive when remove from the button */ + g_object_ref(btnchild); + gtk_container_remove (GTK_CONTAINER (button), btnchild); + + ret = gtk_mode_button_append (mode_button, btnchild); + /* remove the ref, we took ownership when we added it to priv->box */ + g_object_unref(btnchild); + return ret; +} + + void gtk_mode_button_remove (GtkModeButton *mode_button, gint index) { gtkmodebutton/gtkmodebutton.c @@ -67,6 +67,7 @@ void gtk_mode_button_set_selected (GtkModeButton *mode_button, gint index) gint gtk_mode_button_get_hovered (GtkModeButton *mode_button); gint gtk_mode_button_append (GtkModeButton *mode_button, GtkWidget *widget); +gint gtk_mode_button_append_button (GtkModeButton *mode_button, GtkWidget *button); void gtk_mode_button_remove (GtkModeButton *mode_button, gint index); G_END_DECLS gtkmodebutton/gtkmodebutton.h @@ -35,6 +35,7 @@ main (gint argc, gchar *argv[]) GtkWidget *page1; GtkWidget *page2; GtkWidget *hour, *day, *week, *month, *year; + GtkWidget *btn; gtk_init (&argc, &argv); @@ -58,12 +59,15 @@ main (gint argc, gchar *argv[]) week = gtk_label_new ("Week"); month = gtk_label_new ("Month"); year = gtk_label_new ("Year"); + + btn = gtk_button_new_from_stock (GTK_STOCK_OPEN); gtk_mode_button_append (GTK_MODE_BUTTON (mode_button), hour); gtk_mode_button_append (GTK_MODE_BUTTON (mode_button), day); gtk_mode_button_append (GTK_MODE_BUTTON (mode_button), week); gtk_mode_button_append (GTK_MODE_BUTTON (mode_button), month); gtk_mode_button_append (GTK_MODE_BUTTON (mode_button), year); + gtk_mode_button_append_button (GTK_MODE_BUTTON (mode_button), btn); gtk_widget_show (hour); gtk_widget_show (day); gtkmodebutton/main.c dd1453dc6c55ae692ded6cec3787247a966b2da4 John Stowers john.stowers@gmail.com http://github.com/chergert/custom-gtk-widgets/commit/31e43b6086251285fc6f8be73fd65383800e90cd 31e43b6086251285fc6f8be73fd65383800e90cd 2009-08-31T16:22:01-07:00 2009-08-29T18:13:29-07:00 Add gtk_mode_button_append_button * Makes adding stock button to the widget a lot easier Signed-off-by: Christian Hergert <chris@dronelabs.com> a0fc3b99a0283ba0bc12cb863d0d027f21298981 Christian Hergert chris@dronelabs.com