From 6235023c8bff80273981c70a06cb9decb4a4ffa5 Mon Sep 17 00:00:00 2001
From: Lootyhoof <lootyhoofer@gmail.com>
Date: Sat, 6 Jun 2020 00:37:29 +0100
Subject: Issue MoonchildProductions/UXP#1578 - Add global menubar support for
 GTK

---
 layout/build/moz.build           | 4 ++++
 layout/build/nsLayoutStatics.cpp | 7 +++++++
 2 files changed, 11 insertions(+)

(limited to 'layout')

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();
 
-- 
cgit v1.2.3