[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk/window/gtksalframe.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 19b9457ab69c05c96b2adce59e38ed8eb4bf62db
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 17 13:51:16 2015 +0100

    wayland: actually show something
    
    (cherry picked from commit d9b2105e14b7f84c24ced4faea1795e32d8e21d1)
    
    Change-Id: Icd081c38de1374c6bfd6fb04d7765e07ff5d1aff
    Reviewed-on: https://gerrit.libreoffice.org/17196
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index ce2918f..05bd51b 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -105,6 +105,10 @@
 #define IS_WIDGET_MAPPED   GTK_WIDGET_MAPPED
 #endif
 
+#if !GTK_CHECK_VERSION(3,0,0)
+#define GDK_IS_X11_DISPLAY(foo) (true)
+#endif
+
 using namespace com::sun::star;
 
 int GtkSalFrame::m_nFloats = 0;
@@ -1094,7 +1098,10 @@ void GtkSalFrame::InitCommon()
     m_nHudAwarenessId   = 0;
 
     gtk_widget_set_app_paintable( m_pWindow, TRUE );
-    gtk_widget_set_double_buffered( m_pWindow, FALSE );
+    /*non-X11 displays won't show anything at all without double-buffering
+      enabled*/
+    if (GDK_IS_X11_DISPLAY(getGdkDisplay()))
+        gtk_widget_set_double_buffered( m_pWindow, FALSE );
     gtk_widget_set_redraw_on_allocate( m_pWindow, FALSE );
 
     gtk_widget_add_events( m_pWindow,