summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2012-11-21 14:10:40 +0100
committerThorsten Behrens <tbehrens@suse.com>2012-11-21 14:12:04 +0100
commitf5cc79a1202f3c8933d846756cf0a9fe8df49682 (patch)
treef030e2677d47f98cb638f64d589fb67b531b8b20 /vcl/unx
parenta8c2cb0e6d0b9b301887be176694592f8ecda0c4 (diff)
UnityMenu: ensure ENABLE_GMENU_INTEGRATION is actually ever set
Change-Id: I6b7dfd5dd80f45c216c9ec240a390b6434a12672
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/gtk/window/gloactiongroup.cxx2
-rw-r--r--vcl/unx/gtk/window/glomenu.cxx6
-rw-r--r--vcl/unx/gtk/window/gtksalmenu.cxx4
-rw-r--r--vcl/unx/gtk/window/hudawareness.cxx5
4 files changed, 12 insertions, 5 deletions
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