diff options
| author | Lootyhoof <lootyhoofer@gmail.com> | 2020-06-06 00:37:29 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-06-13 11:49:36 +0200 |
| commit | 6235023c8bff80273981c70a06cb9decb4a4ffa5 (patch) | |
| tree | 9673404b3735e8a8b6bd3e890c3d6b5d2d34d76c /layout | |
| parent | f51beb3fdab3d586af081ac14478ea59e0523af4 (diff) | |
| download | UXP-6235023c8bff80273981c70a06cb9decb4a4ffa5.tar UXP-6235023c8bff80273981c70a06cb9decb4a4ffa5.tar.gz UXP-6235023c8bff80273981c70a06cb9decb4a4ffa5.tar.lz UXP-6235023c8bff80273981c70a06cb9decb4a4ffa5.tar.xz UXP-6235023c8bff80273981c70a06cb9decb4a4ffa5.zip | |
Issue MoonchildProductions/UXP#1578 - 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 d71513268..6761931f6 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(); |