diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-09-30 01:28:20 +0200 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-09-30 01:28:20 +0200 |
commit | a01a7932080e8a6e7bc8472c58cefabcc2c37df3 (patch) | |
tree | 94b28b19c8f1536e76ffe7d5826811b74a79e3a5 /src/gtkutil.c | |
parent | cc390e46c7ba95b76ea133d98fd386214cd01709 (diff) | |
parent | 6b0f7311f16646e0de2045b2410e20921901c616 (diff) | |
download | emacs-a01a7932080e8a6e7bc8472c58cefabcc2c37df3.tar.gz emacs-a01a7932080e8a6e7bc8472c58cefabcc2c37df3.tar.bz2 emacs-a01a7932080e8a6e7bc8472c58cefabcc2c37df3.zip |
Merge from trunk
Diffstat (limited to 'src/gtkutil.c')
-rw-r--r-- | src/gtkutil.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index dbd48eb5272..f82be62965d 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -3716,6 +3716,8 @@ xg_tool_bar_menu_proxy (GtkToolItem *toolitem, gpointer user_data) GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (wbutton)); GtkImageType store_type = gtk_image_get_storage_type (wimage); + g_object_set (G_OBJECT (settings), "gtk-menu-images", TRUE, NULL); + if (store_type == GTK_IMAGE_STOCK) { gchar *stock_id; @@ -3974,6 +3976,8 @@ xg_pack_tool_bar (FRAME_PTR f, Lisp_Object pos) if (into_hbox) { + gtk_handle_box_set_handle_position (GTK_HANDLE_BOX (x->handlebox_widget), + GTK_POS_TOP); gtk_box_pack_start (GTK_BOX (x->hbox_widget), x->handlebox_widget, FALSE, FALSE, 0); @@ -3986,6 +3990,8 @@ xg_pack_tool_bar (FRAME_PTR f, Lisp_Object pos) else { int vbox_pos = x->menubar_widget ? 1 : 0; + gtk_handle_box_set_handle_position (GTK_HANDLE_BOX (x->handlebox_widget), + GTK_POS_LEFT); gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->handlebox_widget, FALSE, FALSE, 0); |