From 9cbdfa50403d2c38742d61d21ca4793aa26fcfc8 Mon Sep 17 00:00:00 2001 From: Neil Date: Wed, 26 Aug 2015 10:33:49 +1000 Subject: Removed setting list colours on GTK+ 3.16+ as no longer appears needed. --- doc/ScintillaHistory.html | 2 ++ gtk/PlatGTK.cxx | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 0ce86dd31..eb5a3958c 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -509,6 +509,8 @@
  • On GTK+ 3.x, fix height of lines in autocompletion lists to match the font. + Switch from deprecated style calls to CSS styling. + Removed setting list colours on GTK+ 3.16+ as no longer appears needed.
  • On GTK+, avoid "Invalid rectangle passed" warning messages by never reporting the client diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index d7944e5a0..3f7fc7ec0 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -1571,7 +1571,11 @@ static void StyleSet(GtkWidget *w, GtkStyle*, void*) { recursive calls to this function after the value is updated and w->style to be set to a new object */ -#if GTK_CHECK_VERSION(3,0,0) +#if GTK_CHECK_VERSION(3,16,0) + // On recent releases of GTK+, it does not appear necessary to set the list box colours. + // This may be because of common themes and may be needed with other themes. + // The *override* calls are deprecated now, so only call them for older versions of GTK+. +#elif GTK_CHECK_VERSION(3,0,0) GtkStyleContext *styleContext = gtk_widget_get_style_context(w); if (styleContext == NULL) return; -- cgit v1.2.3