Blame SOURCES/0045-lokdocview-gtktiledviewer-Port-to-gtk3.patch

f325b2
From 29a8e23e7d96689c46299af1ab56c4c3d50d8fb0 Mon Sep 17 00:00:00 2001
f325b2
From: Pranav Kant <pranavk@gnome.org>
f325b2
Date: Wed, 10 Jun 2015 16:18:06 +0530
f325b2
Subject: [PATCH 045/398] lokdocview, gtktiledviewer: Port to gtk3
f325b2
f325b2
Change-Id: I57f2d7b9383790e5c34fc517a905dd537519598f
f325b2
(cherry picked from commit 9b3679301fe4ec4c972b68ef2cbbdd23cbc79053)
f325b2
---
f325b2
 libreofficekit/Executable_gtktiledviewer.mk        |  9 +++++++-
f325b2
 libreofficekit/Library_libreofficekitgtk.mk        | 12 +++++++----
f325b2
 libreofficekit/Module_libreofficekit.mk            |  4 ++--
f325b2
 .../qa/gtktiledviewer/gtktiledviewer.cxx           |  6 ++----
f325b2
 libreofficekit/source/gtk/lokdocview.cxx           | 24 ++++++++++------------
f325b2
 5 files changed, 31 insertions(+), 24 deletions(-)
f325b2
f325b2
diff --git a/libreofficekit/Executable_gtktiledviewer.mk b/libreofficekit/Executable_gtktiledviewer.mk
f325b2
index 8a5206854cca..31028a67fafb 100644
f325b2
--- a/libreofficekit/Executable_gtktiledviewer.mk
f325b2
+++ b/libreofficekit/Executable_gtktiledviewer.mk
f325b2
@@ -16,7 +16,14 @@ $(eval $(call gb_Executable_set_include,gtktiledviewer,\
f325b2
 
f325b2
 $(eval $(call gb_Executable_use_externals,gtktiledviewer,\
f325b2
     boost_headers \
f325b2
-    gtk \
f325b2
+))
f325b2
+
f325b2
+$(eval $(call gb_Executable_add_cxxflags,gtktiledviewer,\
f325b2
+    $$(GTK3_CFLAGS) \
f325b2
+))
f325b2
+
f325b2
+$(eval $(call gb_Executable_add_libs,gtktiledviewer,\
f325b2
+    $(GTK3_LIBS) \
f325b2
 ))
f325b2
 
f325b2
 $(eval $(call gb_Executable_use_libraries,gtktiledviewer,\
f325b2
diff --git a/libreofficekit/Library_libreofficekitgtk.mk b/libreofficekit/Library_libreofficekitgtk.mk
f325b2
index 92409537f4e8..71a77e9e36a3 100644
f325b2
--- a/libreofficekit/Library_libreofficekitgtk.mk
f325b2
+++ b/libreofficekit/Library_libreofficekitgtk.mk
f325b2
@@ -11,15 +11,19 @@ $(eval $(call gb_Library_Library,libreofficekitgtk))
f325b2
 
f325b2
 $(eval $(call gb_Library_use_sdk_api,libreofficekitgtk))
f325b2
 
f325b2
-$(eval $(call gb_Library_use_externals,libreofficekitgtk,\
f325b2
-    gtk \
f325b2
-))
f325b2
-
f325b2
 $(eval $(call gb_Library_add_exception_objects,libreofficekitgtk,\
f325b2
     libreofficekit/source/gtk/lokdocview \
f325b2
     libreofficekit/source/gtk/tilebuffer \
f325b2
 ))
f325b2
 
f325b2
+$(eval $(call gb_Library_add_cxxflags,libreofficekitgtk,\
f325b2
+    $$(GTK3_CFLAGS) \
f325b2
+))
f325b2
+
f325b2
+$(eval $(call gb_Library_add_libs,libreofficekitgtk,\
f325b2
+    $(GTK3_LIBS) \
f325b2
+))
f325b2
+
f325b2
 ifeq ($(OS),LINUX)
f325b2
 $(eval $(call gb_Library_add_libs,libreofficekitgtk,\
f325b2
     -ldl \
f325b2
diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk
f325b2
index 000c2fe7457b..217ecb22ff33 100644
f325b2
--- a/libreofficekit/Module_libreofficekit.mk
f325b2
+++ b/libreofficekit/Module_libreofficekit.mk
f325b2
@@ -15,7 +15,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
f325b2
     CppunitTest_libreofficekit_tiledrendering \
f325b2
 ))
f325b2
 
f325b2
-ifneq ($(ENABLE_GTK),)
f325b2
+ifneq ($(ENABLE_GTK3),)
f325b2
 $(eval $(call gb_Module_add_targets,libreofficekit,\
f325b2
     Library_libreofficekitgtk \
f325b2
     Executable_gtktiledviewer \
f325b2
@@ -24,7 +24,7 @@ $(eval $(call gb_Module_add_targets,libreofficekit,\
f325b2
 $(eval $(call gb_Module_add_targets,libreofficekit,\
f325b2
     Executable_tilebench \
f325b2
 ))
f325b2
-endif # ($(ENABLE_GTK),)
f325b2
+endif # ($(ENABLE_GTK3),)
f325b2
 
f325b2
 endif # ($(OS),LINUX)
f325b2
 
f325b2
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
f325b2
index 2ce541d1ba84..1f77f1be6c4d 100644
f325b2
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
f325b2
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
f325b2
@@ -14,9 +14,7 @@
f325b2
 #include <map>
f325b2
 
f325b2
 #include <boost/property_tree/json_parser.hpp>
f325b2
-#include <gdk/gdk.h>
f325b2
 #include <gdk/gdkkeysyms.h>
f325b2
-#include <gtk/gtk.h>
f325b2
 
f325b2
 #include <LibreOfficeKit/LibreOfficeKitGtk.h>
f325b2
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
f325b2
@@ -208,13 +206,13 @@ static gboolean signalFindbar(GtkWidget* /*pWidget*/, GdkEventKey* pEvent, gpoin
f325b2
     gtk_label_set_text(GTK_LABEL(pFindbarLabel), "");
f325b2
     switch(pEvent->keyval)
f325b2
     {
f325b2
-        case GDK_Return:
f325b2
+        case GDK_KEY_Return:
f325b2
         {
f325b2
             // Search forward.
f325b2
             doSearch(/*bBackwards=*/false);
f325b2
             return TRUE;
f325b2
         }
f325b2
-        case GDK_Escape:
f325b2
+        case GDK_KEY_Escape:
f325b2
         {
f325b2
             // Hide the findbar.
f325b2
             gtk_widget_hide(pFindbar);
f325b2
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
f325b2
index d45ab2db4be5..cd05d0ebbdb9 100644
f325b2
--- a/libreofficekit/source/gtk/lokdocview.cxx
f325b2
+++ b/libreofficekit/source/gtk/lokdocview.cxx
f325b2
@@ -13,8 +13,6 @@
f325b2
 #include <vector>
f325b2
 #include <string>
f325b2
 
f325b2
-#include <gdk/gdkkeysyms.h>
f325b2
-
f325b2
 #include <com/sun/star/awt/Key.hpp>
f325b2
 #define LOK_USE_UNSTABLE_API
f325b2
 #include <LibreOfficeKit/LibreOfficeKit.h>
f325b2
@@ -336,7 +334,7 @@ void LOKDocView_Impl::onExposedImpl(GdkEventExpose* event)
f325b2
     guint nRows = ceil((double)nDocumentHeightPixels / nTileSizePixels);
f325b2
     guint nColumns = ceil((double)nDocumentWidthPixels / nTileSizePixels);
f325b2
     GdkRectangle aVisibleArea = event->area;
f325b2
-    cairo_t *pcairo = gdk_cairo_create(GTK_WIDGET(m_pDocView)->window);
f325b2
+    cairo_t *pcairo = gdk_cairo_create(gtk_widget_get_window(GTK_WIDGET(m_pDocView)));
f325b2
 
f325b2
     aVisibleArea.x = pixelToTwip (aVisibleArea.x, m_fZoom);
f325b2
     aVisibleArea.y = pixelToTwip (aVisibleArea.y, m_fZoom);
f325b2
@@ -401,33 +399,33 @@ void LOKDocView_Impl::signalKey(GdkEventKey* pEvent)
f325b2
 
f325b2
     switch (pEvent->keyval)
f325b2
     {
f325b2
-    case GDK_BackSpace:
f325b2
+    case GDK_KEY_BackSpace:
f325b2
         nKeyCode = com::sun::star::awt::Key::BACKSPACE;
f325b2
         break;
f325b2
-    case GDK_Return:
f325b2
+    case GDK_KEY_Return:
f325b2
         nKeyCode = com::sun::star::awt::Key::RETURN;
f325b2
         break;
f325b2
-    case GDK_Escape:
f325b2
+    case GDK_KEY_Escape:
f325b2
         nKeyCode = com::sun::star::awt::Key::ESCAPE;
f325b2
         break;
f325b2
-    case GDK_Tab:
f325b2
+    case GDK_KEY_Tab:
f325b2
         nKeyCode = com::sun::star::awt::Key::TAB;
f325b2
         break;
f325b2
-    case GDK_Down:
f325b2
+    case GDK_KEY_Down:
f325b2
         nKeyCode = com::sun::star::awt::Key::DOWN;
f325b2
         break;
f325b2
-    case GDK_Up:
f325b2
+    case GDK_KEY_Up:
f325b2
         nKeyCode = com::sun::star::awt::Key::UP;
f325b2
         break;
f325b2
-    case GDK_Left:
f325b2
+    case GDK_KEY_Left:
f325b2
         nKeyCode = com::sun::star::awt::Key::LEFT;
f325b2
         break;
f325b2
-    case GDK_Right:
f325b2
+    case GDK_KEY_Right:
f325b2
         nKeyCode = com::sun::star::awt::Key::RIGHT;
f325b2
         break;
f325b2
     default:
f325b2
-        if (pEvent->keyval >= GDK_F1 && pEvent->keyval <= GDK_F26)
f325b2
-            nKeyCode = com::sun::star::awt::Key::F1 + (pEvent->keyval - GDK_F1);
f325b2
+        if (pEvent->keyval >= GDK_KEY_F1 && pEvent->keyval <= GDK_KEY_F26)
f325b2
+            nKeyCode = com::sun::star::awt::Key::F1 + (pEvent->keyval - GDK_KEY_F1);
f325b2
         else
f325b2
             nCharCode = gdk_keyval_to_unicode(pEvent->keyval);
f325b2
     }
f325b2
-- 
f325b2
2.12.0
f325b2