[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [qtcurve] gtk2/style: [gtk2] suppress useless deprecation warning
From:       Yichao Yu <yyc1992 () gmail ! com>
Date:       2015-03-04 1:46:31
Message-ID: E1YSyON-0001Cm-TP () scm ! kde ! org
[Download RAW message or body]

Git commit a040c0af78fa20593f6412e99cbb6b5fa933f586 by Yichao Yu.
Committed on 04/03/2015 at 01:44.
Pushed by yuyichao into branch 'master'.

[gtk2] suppress useless deprecation warning

M  +10   -0    gtk2/style/pixcache.cpp

http://commits.kde.org/qtcurve/a040c0af78fa20593f6412e99cbb6b5fa933f586

diff --git a/gtk2/style/pixcache.cpp b/gtk2/style/pixcache.cpp
index ffb5219..944a6eb 100644
--- a/gtk2/style/pixcache.cpp
+++ b/gtk2/style/pixcache.cpp
@@ -59,14 +59,24 @@ struct PixEqual {
 
 static std::unordered_map<PixKey, GObjPtr<GdkPixbuf>,
                           PixHash, PixEqual> pixbufMap;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+// Replacement isn't available until the version it is deprecated
+// (gdk-pixbuf-2.0 2.32)
 static GObjPtr<GdkPixbuf> blankPixbuf =
     gdk_pixbuf_new_from_inline(-1, blank16x16, true, nullptr);
+#pragma GCC diagnostic pop
 
 static GdkPixbuf*
 pixbufCacheValueNew(const PixKey &key)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+    // Replacement isn't available until the version it is deprecated
+    // (gdk-pixbuf-2.0 2.32)
     GdkPixbuf *res = gdk_pixbuf_new_from_inline(-1, opts.xCheck ? check_x_on :
                                                 check_on, true, nullptr);
+#pragma GCC diagnostic pop
     qtcAdjustPix(gdk_pixbuf_get_pixels(res), gdk_pixbuf_get_n_channels(res),
                  gdk_pixbuf_get_width(res), gdk_pixbuf_get_height(res),
                  gdk_pixbuf_get_rowstride(res),
[prev in list] [next in list] [prev in thread] [next in thread]