Mercurial > vim

comparison src/gui_gtk_x11.c @ 798:95dac6af3b3a v7.0232

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0232
author vimboss
date Thu, 23 Mar 2006 22:59:57 +0000
parents 86ce35c9750f
children f40f1a8520ff
comparison
equal deleted inserted replaced
797:a1a08851eac8 798:95dac6af3b3a
39 # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS) 39 # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS)
40 # define ENABLE_NLS /* so the texts in the dialog boxes are translated */ 40 # define ENABLE_NLS /* so the texts in the dialog boxes are translated */
41 # endif 41 # endif
42 # include <gnome.h> 42 # include <gnome.h>
43 # include "version.h" 43 # include "version.h"
44 # ifdef HAVE_GTK2
45 /* missing prototype in bonobo-dock-item.h */
46 extern void bonobo_dock_item_set_behavior(BonoboDockItem *dock_item, BonoboDockItemBehavior beh);
47 # endif
44 #endif 48 #endif
45 49
46 #if !defined(FEAT_GUI_GTK) && defined(PROTO) 50 #if !defined(FEAT_GUI_GTK) && defined(PROTO)
47 /* When generating prototypes we don't want syntax errors. */ 51 /* When generating prototypes we don't want syntax errors. */
48 # define GdkAtom int 52 # define GdkAtom int
3539 BonoboDockItem *dockitem; 3543 BonoboDockItem *dockitem;
3540 3544
3541 gnome_app_set_menus(GNOME_APP(gui.mainwin), GTK_MENU_BAR(gui.menubar)); 3545 gnome_app_set_menus(GNOME_APP(gui.mainwin), GTK_MENU_BAR(gui.menubar));
3542 dockitem = gnome_app_get_dock_item_by_name(GNOME_APP(gui.mainwin), 3546 dockitem = gnome_app_get_dock_item_by_name(GNOME_APP(gui.mainwin),
3543 GNOME_APP_MENUBAR_NAME); 3547 GNOME_APP_MENUBAR_NAME);
3544 // bonobo_dock_item_set_behavior(dockitem, 3548 /* We don't want the menu to float. */
3545 // BONOBO_DOCK_ITEM_BEH_NEVER_FLOATING); 3549 bonobo_dock_item_set_behavior(dockitem,
3550 bonobo_dock_item_get_behavior(dockitem)
3551 | BONOBO_DOCK_ITEM_BEH_NEVER_FLOATING);
3546 gui.menubar_h = GTK_WIDGET(dockitem); 3552 gui.menubar_h = GTK_WIDGET(dockitem);
3547 # else 3553 # else
3548 gui.menubar_h = gnome_dock_item_new("VimMainMenu", 3554 gui.menubar_h = gnome_dock_item_new("VimMainMenu",
3549 GNOME_DOCK_ITEM_BEH_EXCLUSIVE | 3555 GNOME_DOCK_ITEM_BEH_EXCLUSIVE |
3550 GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL); 3556 GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL);
3598 gnome_app_set_toolbar(GNOME_APP(gui.mainwin), GTK_TOOLBAR(gui.toolbar)); 3604 gnome_app_set_toolbar(GNOME_APP(gui.mainwin), GTK_TOOLBAR(gui.toolbar));
3599 dockitem = gnome_app_get_dock_item_by_name(GNOME_APP(gui.mainwin), 3605 dockitem = gnome_app_get_dock_item_by_name(GNOME_APP(gui.mainwin),
3600 GNOME_APP_TOOLBAR_NAME); 3606 GNOME_APP_TOOLBAR_NAME);
3601 gui.toolbar_h = GTK_WIDGET(dockitem); 3607 gui.toolbar_h = GTK_WIDGET(dockitem);
3602 /* When the toolbar is floating it gets stuck. So long as that isn't 3608 /* When the toolbar is floating it gets stuck. So long as that isn't
3603 * fixed let's disallow floating. Also changes it appearance... */ 3609 * fixed let's disallow floating. */
3604 bonobo_dock_item_set_behavior(dockitem, 3610 bonobo_dock_item_set_behavior(dockitem,
3605 BONOBO_DOCK_ITEM_BEH_NEVER_FLOATING); 3611 bonobo_dock_item_get_behavior(dockitem)
3612 | BONOBO_DOCK_ITEM_BEH_NEVER_FLOATING);
3606 gtk_container_set_border_width(GTK_CONTAINER(gui.toolbar), 0); 3613 gtk_container_set_border_width(GTK_CONTAINER(gui.toolbar), 0);
3607 # else 3614 # else
3608 GtkWidget *dockitem; 3615 GtkWidget *dockitem;
3609 3616
3610 dockitem = gnome_dock_item_new("VimToolBar", 3617 dockitem = gnome_dock_item_new("VimToolBar",