mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

gtk: Enable creating menu bar.

Browse source
This commit is contained in:
Cheng Zhao 2014-03-14 21:13:28 +08:00
parent 6939e325df
commit 4e4e0f5d4d
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
browser/ui/gtk/menu_gtk.cc
View file

@ -178,11 +178,12 @@ GtkWidget* MenuGtk::Delegate::GetImageForCommandId(int command_id) const {
} }
MenuGtk::MenuGtk(MenuGtk::Delegate* delegate, MenuGtk::MenuGtk(MenuGtk::Delegate* delegate,
ui::MenuModel* model) ui::MenuModel* model,
bool is_menubar)
: delegate_(delegate), : delegate_(delegate),
model_(model), model_(model),
dummy_accel_group_(gtk_accel_group_new()), dummy_accel_group_(gtk_accel_group_new()),
menu_(gtk_custom_menu_new()), menu_(is_menubar ? gtk_menu_bar_new() : gtk_custom_menu_new()),
weak_factory_(this) { weak_factory_(this) {
DCHECK(model); DCHECK(model);
g_object_ref_sink(menu_); g_object_ref_sink(menu_);

4
browser/ui/gtk/menu_gtk.h
View file

@ -56,7 +56,9 @@ class MenuGtk {
static GtkWidget* GetDefaultImageForLabel(const std::string& label); static GtkWidget* GetDefaultImageForLabel(const std::string& label);
}; };
MenuGtk(MenuGtk::Delegate* delegate, ui::MenuModel* model); MenuGtk(MenuGtk::Delegate* delegate,
ui::MenuModel* model,
bool is_menubar = false);
virtual ~MenuGtk(); virtual ~MenuGtk();
// Initialize GTK signal handlers. // Initialize GTK signal handlers.