diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-18 21:00:57 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-01 14:37:55 +0000 |
| commit | 56972b9899b2ec3fdc8c35cb293e0a232d7ffca3 (patch) | |
| tree | d0fb8c4d2c3dca0a3591ea141b194131054ef38a /vcl/inc | |
| parent | 0a5d00507d08179d2511de0b5152e17a238f4a2d (diff) | |
gtk3: get app menu working again under gtk3
and get it working under wayland too
Reviewed-on: https://gerrit.libreoffice.org/22491
Tested-by: Jenkins <ci@libreoffice.org>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 59d978389721c780b1df5e54b833fe75576dd034)
Change-Id: I57592acc4b7ea4a55296541ab4b3bf0c8fd98c5b
loplugin: checkconfigmacros
I suppose
Change-Id: I2821665548077162c4a434876aee407127b312a4
(cherry picked from commit 2f3d85182ff9f2f1174a47b6139f358d232ee5e3)
Reviewed-on: https://gerrit.libreoffice.org/22672
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 20a1e848fb4f..1d8334c97e5e 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -49,6 +49,8 @@ #include <list> #include <vector> +#include <config_vclplug.h> + class GtkSalGraphics; class GtkSalDisplay; @@ -222,7 +224,7 @@ class GtkSalFrame : public SalFrame SalMenu* m_pSalMenu; -#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) +#if defined(ENABLE_DBUS) && ENABLE_GIO public: void EnsureDbusMenuSynced(); private: diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 998a9257d699..5d9c26256a69 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -10,15 +10,17 @@ #ifndef INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX #define INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX +#include <config_vclplug.h> + #include <vector> -#ifdef ENABLE_GIO +#if ENABLE_GIO #include <gio/gio.h> #endif #include <unx/salmenu.h> #include <unx/gtk/gtkframe.hxx> -#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) && \ +#if defined(ENABLE_DBUS) && ENABLE_GIO && \ (GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 36) # define ENABLE_GMENU_INTEGRATION # include <unx/gtk/glomenu.h> |