diff options
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 3 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 6 | ||||
| -rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 9 |
3 files changed, 10 insertions, 8 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 72b91199fb56..3613cf5e0b71 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -213,7 +213,8 @@ class GtkSalFrame : public SalFrame #endif SalMenu* m_pSalMenu; -#ifdef ENABLE_DBUS + +#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) friend void ensure_dbus_setup(GdkWindow* gdkWindow, GtkSalFrame* pSalFrame); friend void on_registrar_available (GDBusConnection*, const gchar*, const gchar*, gpointer); friend void on_registrar_unavailable (GDBusConnection*, const gchar*, gpointer); diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index a5c9973b5459..7c16bb6e652d 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -17,16 +17,16 @@ #include <unx/gtk/gtkframe.hxx> #if defined(ENABLE_DBUS) && defined(ENABLE_GIO) -# ifdef GLIB_AVAILABLE_IN_2_32 +# if GLIB_MAJOR_VERSION > 2 && GLIB_MINOR_VERSION >= 32 # define ENABLE_GMENU_INTEGRATION # endif # include <unx/gtk/glomenu.h> # include <unx/gtk/gloactiongroup.h> #else -# ifndef GLIB_AVAILABLE_IN_2_32 +# if GLIB_MAJOR_VERSION > 2 && GLIB_MINOR_VERSION >= 32 typedef void GMenuModel; # endif -# if !GLIB_CHECK_VERSION(2,28,0) +# if GLIB_MAJOR_VERSION > 2 && GLIB_MINOR_VERSION >= 28 typedef void GActionGroup; # endif #endif diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 88ac7f2d3dd7..5736413d58d5 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -481,12 +481,14 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData ) Init( pSysData ); } -#if !GTK_CHECK_VERSION(3,0,0) && defined(ENABLE_DBUS) && defined(ENABLE_GIO) +#ifdef ENABLE_GMENU_INTEGRATION + static void gdk_x11_window_set_utf8_property (GdkWindow *window, const gchar *name, const gchar *value) { +#if !GTK_CHECK_VERSION(3,0,0) GdkDisplay* display = gdk_window_get_display (window); if (value != NULL) @@ -503,12 +505,11 @@ gdk_x11_window_set_utf8_property (GdkWindow *window, GDK_WINDOW_XID (window), gdk_x11_get_xatom_by_name_for_display (display, name)); } -} #endif +} // AppMenu watch functions. -#ifdef ENABLE_GMENU_INTEGRATION static void ObjectDestroyedNotify( gpointer data ) { if ( data ) { @@ -1135,7 +1136,7 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle ) #if !GTK_CHECK_VERSION(3,0,0) if( eWinType == GTK_WINDOW_TOPLEVEL ) { -#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) +#ifdef ENABLE_GMENU_INTEGRATION // Enable DBus native menu if available. ensure_dbus_setup( this ); #endif |