From f5cc79a1202f3c8933d846756cf0a9fe8df49682 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@suse.com>
Date: Wed, 21 Nov 2012 14:10:40 +0100
Subject: UnityMenu: ensure ENABLE_GMENU_INTEGRATION is actually ever set

Change-Id: I6b7dfd5dd80f45c216c9ec240a390b6434a12672
---
 vcl/unx/gtk/window/gloactiongroup.cxx | 2 ++
 vcl/unx/gtk/window/glomenu.cxx        | 6 ++++--
 vcl/unx/gtk/window/gtksalmenu.cxx     | 4 ++--
 vcl/unx/gtk/window/hudawareness.cxx   | 5 ++++-
 4 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'vcl')

diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx
index 0d253ef8320f..f8132a0010f5 100644
--- a/vcl/unx/gtk/window/gloactiongroup.cxx
+++ b/vcl/unx/gtk/window/gloactiongroup.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <unx/gtk/gtksalmenu.hxx>
+
 #ifdef ENABLE_GMENU_INTEGRATION
 
 #include <unx/gtk/gloactiongroup.h>
diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/window/glomenu.cxx
index c5a01263b470..8227fb1073db 100644
--- a/vcl/unx/gtk/window/glomenu.cxx
+++ b/vcl/unx/gtk/window/glomenu.cxx
@@ -7,11 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifdef ENABLE_GMENU_INTEGRATION
-
 #include <stdio.h>
 #include <string.h>
 
+#include <unx/gtk/gtksalmenu.hxx>
+
+#ifdef ENABLE_GMENU_INTEGRATION
+
 #include <unx/gtk/glomenu.h>
 
 struct _GLOMenu
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index 5474c7bec090..d3c20a265e6e 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -7,10 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifdef ENABLE_GMENU_INTEGRATION
-
 #include <unx/gtk/gtksalmenu.hxx>
 
+#ifdef ENABLE_GMENU_INTEGRATION
+
 #include <unx/gtk/glomenu.h>
 #include <unx/gtk/gloactiongroup.h>
 #include <vcl/menu.hxx>
diff --git a/vcl/unx/gtk/window/hudawareness.cxx b/vcl/unx/gtk/window/hudawareness.cxx
index 1ca2ffafa706..1f2e56f93bcf 100644
--- a/vcl/unx/gtk/window/hudawareness.cxx
+++ b/vcl/unx/gtk/window/hudawareness.cxx
@@ -7,9 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <string.h>
+
+#include <unx/gtk/gtksalmenu.hxx>
+
 #ifdef ENABLE_GMENU_INTEGRATION
 
-#include <string.h>
 #include <unx/gtk/hudawareness.h>
 
 typedef struct
-- 
cgit