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