diff options
author | Elliot Lee <sopwith@redhat.com> | 2000-06-20 20:22:05 +0000 |
---|---|---|
committer | Elliot Lee <sopwith@src.gnome.org> | 2000-06-20 20:22:05 +0000 |
commit | 8f4f35b392510a8b480dd0c7e6030ab834f6aa43 (patch) | |
tree | 43279f2410f52f6548858709bbb344ac4d9054e8 /tests/testgtk.c | |
parent | dd7510dccbf51df37e0d02d31f4daed4e52152e6 (diff) | |
download | gtk+-8f4f35b392510a8b480dd0c7e6030ab834f6aa43.tar.gz |
(follow-on from previous commit)
(follow-on from previous commit)
2000-06-18 Elliot Lee <sopwith@redhat.com>
* gtk/gtkwindow.c: Don't allow creation of a window bigger than the screen.
* gtk/gtkrange.c: Fix the mega-jumpy-with-lagged-events scrollbar
problem by calculating event position relative to the trough
rather than the slider.
* gtk/gtkdnd.c, gtk/gtkcolorsel.c: Include FB headers if appropriate.
* gdk/gdkgc.h: Add GDK_NOR.
* configure.in, Makefile.am: Add modules top level dir
* configure.in: Only use pangox library if building x11 target.
* gdk/gdkdnd.h: Add GDK_DRAG_PROTO_LOCAL enum for future intra-app use.
Diffstat (limited to 'tests/testgtk.c')
-rw-r--r-- | tests/testgtk.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/testgtk.c b/tests/testgtk.c index 6a2303ce68..accc42d7cf 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -5886,7 +5886,7 @@ create_text (void) gtk_text_freeze (GTK_TEXT (text)); - font = gdk_font_load ("-adobe-courier-medium-r-normal--*-120-*-*-*-*-*-*"); + font = NULL; for (i=0; i<ntext_colors; i++) { @@ -8510,7 +8510,7 @@ do_exit (GtkWidget *widget, GtkWidget *window) gtk_main_quit (); } -void +GtkWidget * create_main_window (void) { struct { @@ -8627,6 +8627,7 @@ create_main_window (void) for (i = 0; i < nbuttons; i++) { button = gtk_button_new_with_label (buttons[i].label); + gtk_widget_set_name(button, buttons[i].label); if (buttons[i].func) gtk_signal_connect (GTK_OBJECT (button), "clicked", @@ -8653,6 +8654,8 @@ create_main_window (void) gtk_widget_grab_default (button); gtk_widget_show_all (window); + + return window; } int @@ -8682,9 +8685,7 @@ main (int argc, char *argv[]) "debug_msg", 1, GTK_TYPE_STRING, "GtkWidgetClass <ctrl><release>9 test"); - create_main_window (); - gtk_main (); return 0; |