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

Initial work for Aura on Linux.

Browse source
This commit is contained in:
Cheng Zhao 2014-07-02 14:14:52 +00:00
parent 949821f255
commit 84878c4c77
9 changed files with 287 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_menu.h
View file

@ -87,7 +87,7 @@ class Menu : public mate::Wrappable,
virtual void UpdateStates() = 0;
#endif
#if defined(OS_WIN) || defined(TOOLKIT_GTK)
#if defined(OS_WIN) || defined(OS_LINUX)
virtual void AttachToWindow(Window* window) = 0;
#endif

4
atom/browser/api/atom_api_menu_gtk.cc
View file

@ -19,6 +19,7 @@ MenuGtk::MenuGtk() {
}
void MenuGtk::Popup(Window* window) {
/*
uint32_t triggering_event_time;
gfx::Point point;
@ -35,10 +36,11 @@ void MenuGtk::Popup(Window* window) {
menu_gtk_.reset(new ::MenuGtk(this, model_.get()));
menu_gtk_->PopupAsContext(point, triggering_event_time);
*/
}
void MenuGtk::AttachToWindow(Window* window) {
static_cast<NativeWindowGtk*>(window->window())->SetMenu(model_.get());
// static_cast<NativeWindowGtk*>(window->window())->SetMenu(model_.get());
}
// static