diff options
| author | Jonathan Blandford <jrb@redhat.com> | 2001-10-22 18:24:29 +0000 |
|---|---|---|
| committer | Jonathan Blandford <jrb@src.gnome.org> | 2001-10-22 18:24:29 +0000 |
| commit | dc754528a06824337c9c6276d62b11c77aa19654 (patch) | |
| tree | 24d6dc83f173ead3b71cc1c2fa9bc1dc7d844691 /demos | |
| parent | eb037279db30fc5fc6fddc7af7e0427384209b02 (diff) | |
| download | gtk+-dc754528a06824337c9c6276d62b11c77aa19654.tar.gz | |
Remove handle_box from App demo.
Mon Oct 22 14:08:26 2001 Jonathan Blandford <jrb@redhat.com>
* demos/gtk-demo/appwindow.c: Remove handle_box from App demo.
* gtk/gtktreeview.c (size_allocate): Move to a different drawing
system. Instead of having a window the size of the tree, we have
a window the size of widget->allocation, and simply draw with the
offset.
(coords_are_over_arrow): ditto. Move to window coordinates.
(do_prelight): ditto
(do_unprelight): ditto
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered):
Minor fix from Kristian Rietveld to fix unsorted case.
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/gtk-demo/appwindow.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/demos/gtk-demo/appwindow.c b/demos/gtk-demo/appwindow.c index 1b5df07500..89b517c07f 100644 --- a/demos/gtk-demo/appwindow.c +++ b/demos/gtk-demo/appwindow.c @@ -181,8 +181,6 @@ do_appwindow (void) if (!window) { GtkWidget *table; - GtkWidget *menubar_handle; - GtkWidget *toolbar_handle; GtkWidget *toolbar; GtkWidget *statusbar; GtkWidget *contents; @@ -215,8 +213,6 @@ do_appwindow (void) gtk_accel_group_attach (accel_group, G_OBJECT (window)); gtk_accel_group_unref (accel_group); - menubar_handle = gtk_handle_box_new (); - item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", accel_group); /* Set up item factory to go away with the window */ @@ -231,11 +227,8 @@ do_appwindow (void) gtk_item_factory_create_items (item_factory, G_N_ELEMENTS (menu_items), menu_items, window); - gtk_container_add (GTK_CONTAINER (menubar_handle), - gtk_item_factory_get_widget (item_factory, "<main>")); - gtk_table_attach (GTK_TABLE (table), - menubar_handle, + gtk_item_factory_get_widget (item_factory, "<main>"), /* X direction */ /* Y direction */ 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, 0, @@ -243,8 +236,6 @@ do_appwindow (void) /* Create the toolbar */ - toolbar_handle = gtk_handle_box_new (); - toolbar = gtk_toolbar_new (); gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar), @@ -273,10 +264,8 @@ do_appwindow (void) window, /* user data for callback */ -1); /* -1 means "append" */ - gtk_container_add (GTK_CONTAINER (toolbar_handle), toolbar); - gtk_table_attach (GTK_TABLE (table), - toolbar_handle, + toolbar, /* X direction */ /* Y direction */ 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, 0, |