diff options
author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2015-10-12 22:13:37 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-10-14 08:09:40 +0000 |
commit | 068c04fb06806a9345c0059545d19a416d7e60b7 (patch) | |
tree | 0a0790e03929f9e862baf9347dbe76fc10661c1e /libreofficekit/qa/gtktiledviewer | |
parent | vcl: Free memory by appropriate delete (diff) | |
download | core-068c04fb06806a9345c0059545d19a416d7e60b7.tar.gz core-068c04fb06806a9345c0059545d19a416d7e60b7.zip |
Bump gtk+ version to 2.18
2.18 is the version available in RHEL 6 released in 2010.
Change-Id: I4cd4fc89f6b51e6f58ca72b8182f80316b1f4f88
Reviewed-on: https://gerrit.libreoffice.org/19330
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'libreofficekit/qa/gtktiledviewer')
-rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx index 497f3b98b507..289a999a59c5 100644 --- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx @@ -102,7 +102,6 @@ const float fZooms[] = { 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 3.0, 5.0 }; /// Get the visible area of the scrolled window static void getVisibleAreaTwips(GtkWidget* pDocView, GdkRectangle* pArea) { -#if GTK_CHECK_VERSION(2,14,0) // we need gtk_adjustment_get_page_size() TiledWindow& rWindow = lcl_getTiledWindow(pDocView); GtkAdjustment* pHAdjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(rWindow.m_pScrolledWindow)); @@ -116,7 +115,6 @@ static void getVisibleAreaTwips(GtkWidget* pDocView, GdkRectangle* pArea) gtk_adjustment_get_page_size(pHAdjustment)); pArea->height = lok_doc_view_pixel_to_twip(LOK_DOC_VIEW(pDocView), gtk_adjustment_get_page_size(pVAdjustment)); -#endif } static void changeZoom( GtkWidget* pButton, gpointer /* pItem */ ) |