diff options
| author | Kristian Rietveld <kristian@planet.nl> | 2001-10-02 18:54:05 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2001-10-02 18:54:05 +0000 |
| commit | ced4124efe73184a02b012a7e5e9fa173dcdc90f (patch) | |
| tree | 5c43cee8ce99e355b211b74d9cbae6fa6cc26851 /demos/gtk-demo/appwindow.c | |
| parent | ace5a03b9f2029f567a75be54936ea69e856fa65 (diff) | |
| download | gtk+-ced4124efe73184a02b012a7e5e9fa173dcdc90f.tar.gz | |
add editable_cells.c, list_store.c and tree_store.c
Tue Oct 2 20:18:32 2001 Kristian Rietveld <kristian@planet.nl>
* demos/gtk-demo/Makefile.am: add editable_cells.c,
list_store.c and tree_store.c
* demos/gtk-demo/appwindow.c: remove tearoff item from
File menu, put menubar and toolbar in handle boxes.
* demos/gtk-demo/genincude.pl: various changes to support trees
* demos/gtk-demo/main.c: various changes to support trees
* demos/gtk-demo/stock_browser.c: changed name of demo
to Stock Item and Icon Browser, so geninclude.pl doesn't see
it as child
* demos/gtk-demo/editable_cells.c: new file/demo
* demos/gtk-demo/list_store.c: new file/demo
* demos/gtk-demo/tree_store.c: new file/demo
Diffstat (limited to 'demos/gtk-demo/appwindow.c')
| -rw-r--r-- | demos/gtk-demo/appwindow.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/demos/gtk-demo/appwindow.c b/demos/gtk-demo/appwindow.c index cb88dc7fe8..b1befcbe69 100644 --- a/demos/gtk-demo/appwindow.c +++ b/demos/gtk-demo/appwindow.c @@ -35,7 +35,6 @@ menuitem_cb (gpointer callback_data, static GtkItemFactoryEntry menu_items[] = { { "/_File", NULL, 0, 0, "<Branch>" }, - { "/File/tearoff1", NULL, menuitem_cb, 0, "<Tearoff>" }, { "/File/_New", "<control>N", menuitem_cb, 0, "<StockItem>", GTK_STOCK_NEW }, { "/File/_Open", "<control>O", menuitem_cb, 0, "<StockItem>", GTK_STOCK_OPEN }, { "/File/_Save", "<control>S", menuitem_cb, 0, "<StockItem>", GTK_STOCK_SAVE }, @@ -182,6 +181,8 @@ do_appwindow (void) if (!window) { GtkWidget *table; + GtkWidget *menubar_handle; + GtkWidget *toolbar_handle; GtkWidget *toolbar; GtkWidget *statusbar; GtkWidget *contents; @@ -214,6 +215,8 @@ 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 */ @@ -228,8 +231,11 @@ 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), - gtk_item_factory_get_widget (item_factory, "<main>"), + menubar_handle, /* X direction */ /* Y direction */ 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, 0, @@ -237,6 +243,8 @@ do_appwindow (void) /* Create the toolbar */ + toolbar_handle = gtk_handle_box_new (); + toolbar = gtk_toolbar_new (); gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar), @@ -265,8 +273,10 @@ 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, + toolbar_handle, /* X direction */ /* Y direction */ 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, 0, |