[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - libreofficekit/source

Andras Timar andras.timar at collabora.com
Wed May 25 10:04:53 UTC 2016


 libreofficekit/source/gtk/lokdocview.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a2727e91a0beb6f8182f6448813a3d5c2eba1b8f
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed May 25 12:13:52 2016 +0200

    gtk_widget_get_window requires at least GTK 2.14
    
    Change-Id: Ie795683b5b800d6b00ba54dcb3f5c5a71b39212f

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index ea94237..e54e3d8 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1044,7 +1044,9 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData* pCallback)
         // on my system at least this is not true and many cursors are unsupported.
         // In this case pCursor = null, which results in the default cursor being set.
         GdkCursor* pCursor = gdk_cursor_new_from_name(gtk_widget_get_display(GTK_WIDGET(pCallback->m_pDocView)), pCallback->m_aPayload.c_str());
+#if GTK_CHECK_VERSION(2,14,0)
         gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(pCallback->m_pDocView)), pCursor);
+#endif
     }
     break;
     case LOK_CALLBACK_GRAPHIC_SELECTION:


More information about the Libreoffice-commits mailing list