diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-06-09 16:22:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 16:22:26 +0200 |
| commit | 907530e8669d40c1ff59c2855afcf669fe724263 (patch) | |
| tree | 40312a1ab94ab5e6a3d155e62136309ff4b5acfd /layout | |
| parent | ad6ce890dc38fe71df1c55958aed3128a711fb5a (diff) | |
| parent | d18faf81938c947f1d02feab2c394b8135f88d8f (diff) | |
| download | UXP-907530e8669d40c1ff59c2855afcf669fe724263.tar UXP-907530e8669d40c1ff59c2855afcf669fe724263.tar.gz UXP-907530e8669d40c1ff59c2855afcf669fe724263.tar.lz UXP-907530e8669d40c1ff59c2855afcf669fe724263.tar.xz UXP-907530e8669d40c1ff59c2855afcf669fe724263.zip | |
Merge pull request #1584 from Lootyhoof/global-menu
Add global menubar support for GTK
Diffstat (limited to 'layout')
| -rw-r--r-- | layout/build/moz.build | 4 | ||||
| -rw-r--r-- | layout/build/nsLayoutStatics.cpp | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/layout/build/moz.build b/layout/build/moz.build index b98e8265a..70b075491 100644 --- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -73,6 +73,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': '/dom/system', '/dom/system/android', ] +elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: + LOCAL_INCLUDES += [ + '/widget/gtk', + ] if CONFIG['MOZ_WEBSPEECH']: LOCAL_INCLUDES += [ diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp index 75fae5398..d81a8dfe2 100644 --- a/layout/build/nsLayoutStatics.cpp +++ b/layout/build/nsLayoutStatics.cpp @@ -124,6 +124,10 @@ #include "mozilla/StaticPresData.h" #include "mozilla/dom/WebIDLGlobalNameHash.h" +#ifdef MOZ_WIDGET_GTK +#include "nsNativeMenuAtoms.h" +#endif + using namespace mozilla; using namespace mozilla::net; using namespace mozilla::dom; @@ -158,6 +162,9 @@ nsLayoutStatics::Initialize() nsTextServicesDocument::RegisterAtoms(); nsHTMLTags::RegisterAtoms(); nsRDFAtoms::RegisterAtoms(); +#ifdef MOZ_WIDGET_GTK + nsNativeMenuAtoms::RegisterAtoms(); +#endif NS_SealStaticAtomTable(); |