diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-07-10 18:46:10 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-07-10 18:46:10 +0000 |
| commit | f1b51be787c11090c8d9b2ec73255df7a67c7eb7 (patch) | |
| tree | 9c6d35ce6f19e0fef3c47c7e2c152394854cf217 /widget/gtk/nsWindow.h | |
| parent | 2deaddfca28508ac1a634eb6088a1da8e571ec6e (diff) | |
| parent | 82faff19e1761797b7a75f9221f0709c5a38bfe6 (diff) | |
| download | UXP-f1b51be787c11090c8d9b2ec73255df7a67c7eb7.tar UXP-f1b51be787c11090c8d9b2ec73255df7a67c7eb7.tar.gz UXP-f1b51be787c11090c8d9b2ec73255df7a67c7eb7.tar.lz UXP-f1b51be787c11090c8d9b2ec73255df7a67c7eb7.tar.xz UXP-f1b51be787c11090c8d9b2ec73255df7a67c7eb7.zip | |
Merge branch 'redwood' into releaseRELBASE_20200711
Diffstat (limited to 'widget/gtk/nsWindow.h')
| -rw-r--r-- | widget/gtk/nsWindow.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h index 49a8d4baf..c45176cea 100644 --- a/widget/gtk/nsWindow.h +++ b/widget/gtk/nsWindow.h @@ -35,6 +35,8 @@ #include "IMContextWrapper.h" +#include "nsMenuBar.h" + #undef LOG #ifdef MOZ_LOGGING @@ -162,6 +164,8 @@ public: nsIScreen* aTargetScreen = nullptr) override; NS_IMETHOD HideWindowChrome(bool aShouldHide) override; + void SetMenuBar(mozilla::UniquePtr<nsMenuBar> aMenuBar); + /** * GetLastUserInputTime returns a timestamp for the most recent user input * event. This is intended for pointer grab requests (including drags). @@ -569,6 +573,8 @@ private: RefPtr<mozilla::widget::IMContextWrapper> mIMContext; mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter; + + mozilla::UniquePtr<nsMenuBar> mMenuBar; }; class nsChildWindow : public nsWindow { |