summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Jon McCann <william.jon.mccann@gmail.com>2014-01-06 17:14:14 -0500
committerWilliam Jon McCann <william.jon.mccann@gmail.com>2014-01-07 08:46:37 -0500
commit0a95515bfe0f86498532d02a254514a081367257 (patch)
tree1455b1fba655cb732bbfcce34d861f5c2f23085c
parente72aca055d347a3dafa68c8307ffc765c5bab9b3 (diff)
downloadgtk+-0a95515bfe0f86498532d02a254514a081367257.tar.gz
tests: use actionbar in headerbar test
This is a great example of where headerbar should not be used. https://bugzilla.gnome.org/show_bug.cgi?id=721665
-rw-r--r--tests/testheaderbar.c30
1 files changed, 5 insertions, 25 deletions
diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c
index 88d2374aba..d2b1a5ffa7 100644
--- a/tests/testheaderbar.c
+++ b/tests/testheaderbar.c
@@ -38,22 +38,6 @@ on_bookmark_clicked (GtkButton *button, gpointer data)
gtk_widget_show (chooser);
}
-static void
-change_title (GtkButton *button, gpointer data)
-{
- GtkWidget *header = GTK_WIDGET (data);
-
- if (gtk_header_bar_get_custom_title (GTK_HEADER_BAR (header)) == NULL)
- {
- gtk_header_bar_set_custom_title (GTK_HEADER_BAR (header), gtk_check_button_new_with_label ("Middle"));
- }
- else
- {
- gtk_header_bar_set_custom_title (GTK_HEADER_BAR (header), NULL);
- gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Middle");
- }
-}
-
static GtkWidget *header;
static void
@@ -166,20 +150,16 @@ main (int argc, char *argv[])
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), box);
- footer = gtk_header_bar_new ();
- button = gtk_button_new_with_label ("Title");
- g_signal_connect (button, "clicked", G_CALLBACK (change_title), footer);
- gtk_header_bar_pack_start (GTK_HEADER_BAR (footer), button);
- gtk_header_bar_set_custom_title (GTK_HEADER_BAR (footer), gtk_check_button_new_with_label ("Middle"));
+ footer = gtk_action_bar_new ();
+ gtk_action_bar_set_center_widget (GTK_ACTION_BAR (footer), gtk_check_button_new_with_label ("Middle"));
button = gtk_toggle_button_new_with_label ("Custom");
g_signal_connect (button, "clicked", G_CALLBACK (change_header), window);
- gtk_header_bar_pack_start (GTK_HEADER_BAR (footer), button);
- gtk_header_bar_set_custom_title (GTK_HEADER_BAR (footer), gtk_check_button_new_with_label ("Middle"));
+ gtk_action_bar_pack_start (GTK_ACTION_BAR (footer), button);
button = gtk_button_new_with_label ("Subtitle");
g_signal_connect (button, "clicked", G_CALLBACK (change_subtitle), NULL);
- gtk_header_bar_pack_end (GTK_HEADER_BAR (footer), button);
+ gtk_action_bar_pack_end (GTK_ACTION_BAR (footer), button);
button = gtk_button_new_with_label ("Fullscreen");
- gtk_header_bar_pack_end (GTK_HEADER_BAR (footer), button);
+ gtk_action_bar_pack_end (GTK_ACTION_BAR (footer), button);
g_signal_connect (button, "clicked", G_CALLBACK (toggle_fullscreen), window);
gtk_box_pack_end (GTK_BOX (box), footer, FALSE, FALSE, 0);