diff options
author | Thorsten Behrens <tbehrens@suse.com> | 2012-11-21 13:03:26 +0100 |
---|---|---|
committer | Thorsten Behrens <tbehrens@suse.com> | 2012-11-21 13:04:16 +0100 |
commit | 463f34737e01ca277a7b87741aed8daad9bc45cf (patch) | |
tree | b29f056ae3414c3698d3c659fa4a8225c93b8414 /vcl/unx | |
parent | d85fd8a85501547d5bb87822d2589a07aed7f2d6 (diff) |
UnityMenu: don't build when ENABLE_GMENU_INTEGRATION is not on
Change-Id: Iba9e6c3d2483a20ed3ec33b85b4c5f78830fd2f6
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/gtk/window/gloactiongroup.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/window/glomenu.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtksalmenu.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/window/hudawareness.cxx | 7 |
4 files changed, 18 insertions, 1 deletions
diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx index ade8551e15b2..0d253ef8320f 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/. */ +#ifdef ENABLE_GMENU_INTEGRATION + #include <unx/gtk/gloactiongroup.h> #include <unx/gtk/gtkinst.hxx> @@ -404,4 +406,6 @@ g_lo_action_group_clear (GLOActionGroup *group) } } +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/window/glomenu.cxx index a712979ecfaa..c5a01263b470 100644 --- a/vcl/unx/gtk/window/glomenu.cxx +++ b/vcl/unx/gtk/window/glomenu.cxx @@ -7,6 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifdef ENABLE_GMENU_INTEGRATION + #include <stdio.h> #include <string.h> @@ -649,4 +651,6 @@ g_lo_menu_class_init (GLOMenuClass *klass) model_class->get_item_links = g_lo_menu_get_item_links; } +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index 30c93995edad..5474c7bec090 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -7,6 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifdef ENABLE_GMENU_INTEGRATION + #include <unx/gtk/gtksalmenu.hxx> #include <unx/gtk/glomenu.h> @@ -797,4 +799,6 @@ GtkSalMenuItem::~GtkSalMenuItem() { } +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/gtk/window/hudawareness.cxx b/vcl/unx/gtk/window/hudawareness.cxx index 69261c60f03c..1ca2ffafa706 100644 --- a/vcl/unx/gtk/window/hudawareness.cxx +++ b/vcl/unx/gtk/window/hudawareness.cxx @@ -1,5 +1,4 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /* * This file is part of the LibreOffice project. * @@ -8,6 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifdef ENABLE_GMENU_INTEGRATION + #include <string.h> #include <unx/gtk/hudawareness.h> @@ -102,3 +103,7 @@ hud_awareness_unregister (GDBusConnection *connection, { g_dbus_connection_unregister_object (connection, subscription_id); } + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |