[Libreoffice-commits] core.git: 2 commits - sw/source vcl/unx

[Caolán McNamara]

 sw/source/uibase/docvw/edtwin.cxx  |    2 +-
 vcl/unx/gtk/app/gtkdata.cxx        |    2 +-
 vcl/unx/gtk/window/gtksalframe.cxx |   11 ++++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

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

    wayland: actually show something
    
    Change-Id: Icd081c38de1374c6bfd6fb04d7765e07ff5d1aff

diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index b1e552b..c42c68d 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -52,7 +52,7 @@
 # endif
 #else
 # define GDK_WINDOWING_X11
-# define GDK_IS_X11_DISPLAY(foo) true
+# define GDK_IS_X11_DISPLAY(foo) (true)
 #endif
 
 using namespace vcl_sal;
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 3bedf78..bdb360a 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -105,6 +105,12 @@
 #define IS_WIDGET_MAPPED   GTK_WIDGET_MAPPED
 #endif
 
+#if !GTK_CHECK_VERSION(3,10,0)
+#define GDK_WINDOWING_X11
+#define GDK_IS_X11_DISPLAY(foo) (true)
+#endif
+
+
 using namespace com::sun::star;
 
 int GtkSalFrame::m_nFloats = 0;
@@ -1093,7 +1099,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,
commit e5a17569366188420394fd9461c821c0d83e98e7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 17 14:32:41 2015 +0100

    ignore long press after all in writer
    
    it appears on a long press on anything not just the document,
    e.g. on scrollbars etc, which isn't that useful after all
    
    Change-Id: Ic6ccacecdad5db100d2f2768ad6b7ce5e36b80a3

diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 510518e..1ca2bf9 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5123,7 +5123,6 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
     switch ( rCEvt.GetCommand() )
     {
     case CommandEventId::ContextMenu:
-    case CommandEventId::LongPress:
     {
             const sal_uInt16 nId = SwInputChild::GetChildWindowId();
             SwInputChild* pChildWin = static_cast<SwInputChild*>(GetView().GetViewFrame()->
@@ -5208,6 +5207,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
             bCallBase = !m_rView.HandleWheelCommands( rCEvt );
             break;
 
+    case CommandEventId::LongPress:
     case CommandEventId::Swipe: //nothing yet
             break;