Skip to content

Commit 03f17be

Browse files
committed
Fix menu & shortcut support
1 parent 0c68d70 commit 03f17be

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

src/api/dispatcher_bindings.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,11 @@ DispatcherBindings::GetNativeFunctionTemplate(
164164
return v8::FunctionTemplate::New(isolate, GetNSStringWithFixup);
165165
else if (name->Equals(v8::String::NewFromUtf8(isolate, "GetNSStringFWithFixup")))
166166
return v8::FunctionTemplate::New(isolate, GetNSStringFWithFixup);
167+
#else
168+
else if (name->Equals(v8::String::NewFromUtf8(isolate, "GetNSStringWithFixup")))
169+
return v8::FunctionTemplate::New(isolate);
170+
else if (name->Equals(v8::String::NewFromUtf8(isolate, "GetNSStringFWithFixup")))
171+
return v8::FunctionTemplate::New(isolate);
167172
#endif
168173
NOTREACHED() << "Trying to get an non-exist function in DispatcherBindings:"
169174
<< *v8::String::Utf8Value(name);

src/api/menuitem/menuitem_gtk.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ void MenuItem::Create(const base::DictionaryValue& option) {
3131
std::string type;
3232
option.GetString("type", &type);
3333
submenu_ = NULL;
34+
gtk_accel_group = NULL;
3435

3536
if (type == "separator") {
3637
menu_item_ = gtk_separator_menu_item_new();

0 commit comments

Comments
 (0)