Bump gtk+ version to 2.18

Desktop / LibreOffice - Riccardo Magliocchetti [gmail.com] - 14 October 2015 03:09 UTC

2.18 is the version available in RHEL 6 released in 2010.

Change-Id: I4cd4fc89f6b51e6f58ca72b8182f80316b1f4f88 Reviewed-on: https://gerrit.libreoffice.org/19330

###

diff --git a/configure.ac b/configure.ac
index bea2484..e1814ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10125,7 +10125,7 @@ ENABLE_SYSTRAY_GTK=""
if test "$test_gtk" = "yes"; then

if test "$ENABLE_GTK" = "TRUE"; then
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10.0 gdk-pixbuf-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18.0 gdk-pixbuf-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
GTK_CFLAGS=$(printf '%s' "$GTK_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
PKG_CHECK_MODULES(GTHREAD, gthread-2.0,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
BUILD_TYPE="$BUILD_TYPE GTK"
@@ -10181,7 +10181,7 @@ if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_telepathy" = "yes";
ENABLE_TELEPATHY="TRUE"
AC_DEFINE(ENABLE_TELEPATHY)
AC_MSG_RESULT([yes])
- PKG_CHECK_MODULES( TELEPATHY, telepathy-glib >= 0.18.0 glib-2.0 gobject-2.0 gthread-2.0 gio-2.0 gtk+-2.0 >= 2.10 )
+ PKG_CHECK_MODULES( TELEPATHY, telepathy-glib >= 0.18.0 glib-2.0 gobject-2.0 gthread-2.0 gio-2.0 gtk+-2.0 >= 2.18.0 )
TELEPATHY_CFLAGS=$(printf '%s' "$TELEPATHY_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
else
AC_MSG_RESULT([no])
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 497f3b9..289a999 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 */ )
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 90349f7..2de5654 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -370,10 +370,8 @@ void plugin_init_sys_tray()
{
::SolarMutexGuard aGuard;

- if( /* need gtk_status to resolve */
- (gtk_check_version( 2, 10, 0 ) != NULL) ||
- /* we need the vcl plugin and mainloop initialized */
- !g_type_from_name( "GdkDisplay" ) )
+ /* we need the vcl plugin and mainloop initialized */
+ if (!g_type_from_name( "GdkDisplay" ))
return;

OString aLabel;
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 694d057..e203392 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -763,9 +763,8 @@ void GtkData::Init()
pDisplay->monitorsChanged( pScreen );
g_signal_connect( G_OBJECT(pScreen), "size-changed",
G_CALLBACK(signalScreenSizeChanged), pDisplay );
- if( ! gtk_check_version( 2, 14, 0 ) ) // monitors-changed came in with 2.14, avoid an assertion
- g_signal_connect( G_OBJECT(pScreen), "monitors-changed",
- G_CALLBACK(signalMonitorsChanged), GetGtkDisplay() );
+ g_signal_connect( G_OBJECT(pScreen), "monitors-changed",
+ G_CALLBACK(signalMonitorsChanged), GetGtkDisplay() );
}
}
}
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index c41c408..6243c92 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -89,14 +89,12 @@ extern "C"
}

const gchar* pVersion = gtk_check_version( 3, 2, 0 );
-#else
- const gchar* pVersion = gtk_check_version( 2, 2, 0 );
-#endif
if( pVersion )
{
SAL_WARN("vcl.gtk", "gtk version conflict: " << pVersion);
return NULL;
}
+#endif

GtkYieldMutex *pYieldMutex;

diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index 7c5e781..b43ac63 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -188,7 +188,6 @@ bool GtkSalSystem::IsUnifiedDisplay()
}

namespace {
-#if GTK_CHECK_VERSION(2,14,0)
static int _fallback_get_primary_monitor (GdkScreen *pScreen)
{
// Use monitor name as primacy heuristic
@@ -203,7 +202,6 @@ static int _fallback_get_primary_monitor (GdkScreen *pScreen)
}
return 0;
}
-#endif

static int _get_primary_monitor (GdkScreen *pScreen)
{
@@ -217,10 +215,8 @@ static int _get_primary_monitor (GdkScreen *pScreen)
get_fn = reinterpret_cast(osl_getAsciiFunctionSymbol(NULL,
"gdk_screen_get_primary_monitor"));
}
-#if GTK_CHECK_VERSION(2,14,0)
if (!get_fn)
get_fn = _fallback_get_primary_monitor;
-#endif
if (get_fn)
return get_fn (pScreen);
else
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 8438e76..ff520ab 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3155,7 +3155,6 @@ bool GtkSalGraphics::NWPaintGTKToolbar(
{
const double shim = 0.2;

-#if GTK_CHECK_VERSION(2,10,0)
gint separator_height, separator_width, wide_separators = 0;

gtk_widget_style_get (gWidgetData[m_nXScreen].gSeparator,
@@ -3180,7 +3179,6 @@ bool GtkSalGraphics::NWPaintGTKToolbar(
w * (1 - 2*shim), separator_width);
}
else
-#endif
{
if (nPart == PART_SEPARATOR_VERT)
gtk_paint_vline (gWidgetData[m_nXScreen].gSeparator->style, gdkDrawable,
@@ -4009,23 +4007,20 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
aStyleSet.SetHighlightColor( aHighlightColor );
aStyleSet.SetHighlightTextColor( aHighlightTextColor );

- if( ! gtk_check_version( 2, 10, 0 ) ) // link colors came in with 2.10, avoid an assertion
+ // hyperlink colors
+ GdkColor *link_color = NULL;
+ gtk_widget_style_get (m_pWindow, "link-color", &link_color, NULL);
+ if (link_color)
{
- // hyperlink colors
- GdkColor *link_color = NULL;
- gtk_widget_style_get (m_pWindow, "link-color", &link_color, NULL);
- if (link_color)
- {
- aStyleSet.SetLinkColor(getColor(*link_color));
- gdk_color_free (link_color);
- link_color = NULL;
- }
- gtk_widget_style_get (m_pWindow, "visited-link-color", &link_color, NULL);
- if (link_color)
- {
- aStyleSet.SetVisitedLinkColor(getColor(*link_color));
- gdk_color_free (link_color);
- }
+ aStyleSet.SetLinkColor(getColor(*link_color));
+ gdk_color_free (link_color);
+ link_color = NULL;
+ }
+ gtk_widget_style_get (m_pWindow, "visited-link-color", &link_color, NULL);
+ if (link_color)
+ {
+ aStyleSet.SetVisitedLinkColor(getColor(*link_color));
+ gdk_color_free (link_color);
}

// Tab colors
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index d05f71b..cf20b2c 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -318,15 +318,9 @@ lcl_setHelpText(
const uno::Sequence& i_rHelpTexts,
const sal_Int32 i_nIndex)
{
-#if GTK_CHECK_VERSION(2,12,0)
if (i_nIndex >= 0 && i_nIndex < i_rHelpTexts.getLength())
gtk_widget_set_tooltip_text(io_pWidget,
OUStringToOString(i_rHelpTexts.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8).getStr());
-#else
- (void)io_pWidget;
- (void)i_rHelpTexts;
- (void)i_nIndex;
-#endif
}

static GtkWidget*
@@ -429,12 +423,8 @@ GtkPrintDialog::impl_initDialog()
| GTK_PRINT_CAPABILITY_COLLATE
| GTK_PRINT_CAPABILITY_REVERSE
| GTK_PRINT_CAPABILITY_GENERATE_PS
-#if GTK_CHECK_VERSION(2,12,0)
| GTK_PRINT_CAPABILITY_NUMBER_UP
-#endif
-#if GTK_CHECK_VERSION(2,14,0)
| GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT
-#endif
));
}

@@ -787,11 +777,9 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence const& i_rDisabled
ePrintPages = GTK_PRINT_PAGES_RANGES;
break;
case 2:
-#if GTK_CHECK_VERSION(2,14,0)
if (m_xWrapper->supportsPrintSelection())
ePrintPages = GTK_PRINT_PAGES_SELECTION;
else
-#endif
SAL_INFO("vcl.gtk", "the application wants to print a selection, but the present gtk version does not support it");
break;
default:
@@ -999,7 +987,6 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe
}
catch (...) {}
}
-#if GTK_CHECK_VERSION(2,17,5)
if (gtk_print_unix_dialog_get_has_selection(GTK_PRINT_UNIX_DIALOG(m_pDialog)))
{
uno::Any aSelection;
@@ -1022,7 +1009,6 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe
aFilterData[aFilterData.getLength()-1].Value <<= aSelection;
}
}
-#endif
uno::Sequence aArgs(2);
aArgs[0].Name = "FilterData";
aArgs[0].Value <<= aFilterData;
diff --git a/vcl/unx/gtk/inc/gtkprintwrapper.hxx b/vcl/unx/gtk/inc/gtkprintwrapper.hxx
index 955cd43..8840d6c 100644
--- a/vcl/unx/gtk/inc/gtkprintwrapper.hxx
+++ b/vcl/unx/gtk/inc/gtkprintwrapper.hxx
@@ -13,13 +13,7 @@
#include

#if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0)
-#if GTK_CHECK_VERSION(2,14,0)
#include
-#else
-#include
-#include
-#include
-#endif

#include
#include

068c04f Bump gtk+ version to 2.18
configure.ac | 4 +--
.../qa/gtktiledviewer/gtktiledviewer.cxx | 2 --
sfx2/source/appl/shutdowniconunx.cxx | 6 ++--
vcl/unx/gtk/app/gtkdata.cxx | 5 ++--
vcl/unx/gtk/app/gtkinst.cxx | 4 +--
vcl/unx/gtk/app/gtksys.cxx | 4 ---
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 31 ++++++++------------
vcl/unx/gtk/gdi/salprn-gtk.cxx | 14 ---------
vcl/unx/gtk/inc/gtkprintwrapper.hxx | 6 ----
9 files changed, 20 insertions(+), 56 deletions(-)

Upstream: cgit.freedesktop.org

  • Share