diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-10-14 18:13:43 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-10-14 18:13:43 +0100 |
| commit | 642204067c6217190074a560106b3e238c9d9a73 (patch) | |
| tree | 142bb5ff196e15a3add40386133585d3fabe72af /vcl/unx | |
| parent | c9bcb29f3b733a1230f78e7a03aac1a02d856cf7 (diff) | |
fix build against glib < 2.36 (w/o gmenu)
Change-Id: Ia60195d48717dc87c8a8a5753477604cbdd0c79e
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk/window/gtksalframe.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 1f1bf2c34ab0..ebc85166caa5 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -1449,7 +1449,6 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle ) InitCommon(); -#if !GTK_CHECK_VERSION(3,0,0) if( eWinType == GTK_WINDOW_TOPLEVEL ) { #ifdef ENABLE_GMENU_INTEGRATION @@ -1457,20 +1456,15 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle ) ensure_dbus_setup( this ); #endif +#if !GTK_CHECK_VERSION(3,0,0) guint32 nUserTime = 0; if( (nStyle & (SalFrameStyleFlags::OWNERDRAWDECORATION|SalFrameStyleFlags::TOOLWINDOW)) == SalFrameStyleFlags::NONE ) { nUserTime = gdk_x11_get_server_time(GTK_WIDGET (m_pWindow)->window); } lcl_set_user_time(GTK_WINDOW(m_pWindow), nUserTime); - } -#else - if( eWinType == GTK_WINDOW_TOPLEVEL ) - { - // Enable DBus native menu if available. - ensure_dbus_setup( this ); - } #endif + } if( bDecoHandling ) { |