summaryrefslogtreecommitdiff
path: root/layout
diff options
context:
space:
mode:
authorLootyhoof <lootyhoofer@gmail.com>2020-06-06 00:37:29 +0100
committerLootyhoof <lootyhoofer@gmail.com>2020-06-09 13:41:53 +0100
commitd18faf81938c947f1d02feab2c394b8135f88d8f (patch)
tree17ad9c1ecb14acd726cb8404c3a82e2781e27253 /layout
parentfdb918dea124a6efaf0c86f6d5c2ab1b83013e40 (diff)
downloaduxp-d18faf81938c947f1d02feab2c394b8135f88d8f.tar.gz
Issue MoonchildProductions/UXP#1578 - Add global menubar support for GTK
Diffstat (limited to 'layout')
-rw-r--r--layout/build/moz.build4
-rw-r--r--layout/build/nsLayoutStatics.cpp7
2 files changed, 11 insertions, 0 deletions
diff --git a/layout/build/moz.build b/layout/build/moz.build
index b98e8265a3..70b0754914 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 75fae5398e..d81a8dfe2d 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();