From 96f9b67b516fb9f89062367e7c20e8596a39b741 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 9 Aug 2011 02:02:55 +0200 Subject: [PATCH] Fix minor issues in the tests --- tests/testfontchooser.c | 26 +++++++++++++------------- tests/testfontchooserdialog.c | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/testfontchooser.c b/tests/testfontchooser.c index bca728d5c3..49f5b5c72f 100644 --- a/tests/testfontchooser.c +++ b/tests/testfontchooser.c @@ -17,8 +17,6 @@ * Boston, MA 02111-1307, USA. */ -#include "config.h" - #include static void @@ -37,31 +35,33 @@ int main (int argc, char *argv[]) { GtkWidget *window; - GtkWidget *hbox; + GtkWidget *box; GtkWidget *fontchooser; - + gtk_init (NULL, NULL); - + fontchooser = gtk_font_chooser_new (); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_widget_set_size_request (window, 600, 600); - hbox = gtk_hbox_new (FALSE, 6); - gtk_container_add (GTK_CONTAINER (window), hbox); - gtk_container_add (GTK_CONTAINER (hbox), fontchooser); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + gtk_container_add (GTK_CONTAINER (window), box); + gtk_container_add (GTK_CONTAINER (box), fontchooser); gtk_widget_show_all (window); - g_signal_connect (G_OBJECT (window), "delete-event", G_CALLBACK(gtk_main_quit), NULL); - g_signal_connect (G_OBJECT (fontchooser), "notify::font-name", G_CALLBACK(notify_font_name_cb), NULL); - g_signal_connect (G_OBJECT (fontchooser), "notify::preview-text", G_CALLBACK(notify_preview_text_cb), NULL); + g_signal_connect (window, "delete-event", + G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect (fontchooser, "notify::font-name", + G_CALLBACK (notify_font_name_cb), NULL); + g_signal_connect (fontchooser, "notify::preview-text", + G_CALLBACK (notify_preview_text_cb), NULL); gtk_font_chooser_set_font_name (GTK_FONT_CHOOSER (fontchooser), "Bitstream Vera Sans 45"); gtk_font_chooser_set_preview_text (GTK_FONT_CHOOSER (fontchooser), "[user@host ~]$ "); + gtk_font_chooser_set_show_preview_entry (GTK_FONT_CHOOSER (fontchooser), FALSE); gtk_main (); - gtk_widget_destroy (window); - return 0; } diff --git a/tests/testfontchooserdialog.c b/tests/testfontchooserdialog.c index 952ec8c8b1..23be106124 100644 --- a/tests/testfontchooserdialog.c +++ b/tests/testfontchooserdialog.c @@ -17,7 +17,6 @@ * Boston, MA 02111-1307, USA. */ -#include "config.h" #include int @@ -32,5 +31,6 @@ main (int argc, char *argv[]) gtk_widget_show_all (window); gtk_main (); + return 0; }