vcl/inc/unx/gtk/gtkframe.hxx | 2 +- vcl/inc/unx/gtk/gtksalmenu.hxx | 4 ++-- vcl/unx/gtk/gtksalframe.cxx | 8 ++++---- vcl/unx/gtk3/gtk3gtkframe.cxx | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-)
New commits: commit 2f3d85182ff9f2f1174a47b6139f358d232ee5e3 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Feb 19 10:55:46 2016 +0000 loplugin: checkconfigmacros I suppose Change-Id: I2821665548077162c4a434876aee407127b312a4 diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 280ded7..10b0ecf 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -224,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 cc0193c..8df2c1d 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -13,14 +13,14 @@ #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> diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 789f7f2..ff1c9e6 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -42,7 +42,7 @@ #include <config_vclplug.h> #include <unx/x11/xlimits.hxx> -#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) +#if defined(ENABLE_DBUS) && ENABLE_GIO # include <unx/gtk/gtksalmenu.hxx> #endif #if defined ENABLE_GMENU_INTEGRATION // defined in gtksalmenu.hxx above @@ -437,7 +437,7 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) m_bDefaultPos = true; m_bDefaultSize = ( (nStyle & SalFrameStyleFlags::SIZEABLE) && ! pParent ); m_bWindowIsGtkPlug = false; -#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) +#if defined(ENABLE_DBUS) && ENABLE_GIO m_pLastSyncedDbusMenu = nullptr; #endif Init( pParent, nStyle ); @@ -453,7 +453,7 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData ) GetGenericData()->ErrorTrapPush(); m_bDefaultPos = true; m_bDefaultSize = true; -#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) +#if defined(ENABLE_DBUS) && ENABLE_GIO m_pLastSyncedDbusMenu = nullptr; #endif Init( pSysData ); @@ -493,7 +493,7 @@ static void ObjectDestroyedNotify( gpointer data ) } } -#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) +#if defined(ENABLE_DBUS) && ENABLE_GIO void GtkSalFrame::EnsureDbusMenuSynced() { GtkSalMenu* pSalMenu = static_cast<GtkSalMenu*>(GetMenu()); diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 8e93985..ddfa0fc 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -40,7 +40,7 @@ #include <config_vclplug.h> -#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) +#if defined(ENABLE_DBUS) && ENABLE_GIO # include <unx/gtk/gtksalmenu.hxx> #endif #if defined ENABLE_GMENU_INTEGRATION // defined in gtksalmenu.hxx above @@ -463,7 +463,7 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) m_bDefaultPos = true; m_bDefaultSize = ( (nStyle & SalFrameStyleFlags::SIZEABLE) && ! pParent ); m_bWindowIsGtkPlug = false; -#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) +#if defined(ENABLE_DBUS) && ENABLE_GIO m_pLastSyncedDbusMenu = nullptr; #endif Init( pParent, nStyle ); @@ -479,7 +479,7 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData ) GetGenericData()->ErrorTrapPush(); m_bDefaultPos = true; m_bDefaultSize = true; -#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) +#if defined(ENABLE_DBUS) && ENABLE_GIO m_pLastSyncedDbusMenu = nullptr; #endif Init( pSysData ); @@ -496,7 +496,7 @@ static void ObjectDestroyedNotify( gpointer data ) } } -#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) +#if defined(ENABLE_DBUS) && ENABLE_GIO void GtkSalFrame::EnsureDbusMenuSynced() { GtkSalMenu* pSalMenu = static_cast<GtkSalMenu*>(GetMenu());
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits