[pangomm/pangomm-2-42] Coverage: Ignore deprecations



commit 1bff18d16d8267a1c40c101f600507c41ea28318
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Mon Jul 22 11:08:00 2019 +0200

    Coverage: Ignore deprecations
    
    pango_coverage_from_bytes(), pango_coverage_to_bytes() and
    pango_coverage_max() are deprecated in pango 1.43, but not in pangomm 2.42.
    Suppress deprecation warnings to make it possible to build pangomm 2.42
    with the newest version of pango.

 pango/src/coverage.ccg | 17 +++++++++++++----
 pango/src/coverage.hg  | 12 ++++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/pango/src/coverage.ccg b/pango/src/coverage.ccg
index 1734653..8bbacbd 100644
--- a/pango/src/coverage.ccg
+++ b/pango/src/coverage.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: coverage.ccg,v 1.1 2003/01/21 13:41:02 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-1999 The Gtk-- Development Team
  * Copyright 2001      Free Software Foundation
  *
@@ -24,6 +20,13 @@
 namespace Pango
 {
 
+// Deprecated in pango 1.43, but not in pangomm 2.42.
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+Glib::RefPtr<Coverage> Coverage::create(const guchar* bytes, int n_bytes)
+{
+  return Glib::wrap(pango_coverage_from_bytes(const_cast<guchar*>(bytes), n_bytes));
+}
+
 Glib::ArrayHandle<unsigned char> Coverage::to_bytes() const
 {
   guchar* bytes = 0;
@@ -32,4 +35,10 @@ Glib::ArrayHandle<unsigned char> Coverage::to_bytes() const
   return Glib::ArrayHandle<unsigned char>(bytes, n_bytes, Glib::OWNERSHIP_SHALLOW);
 }
 
+void Coverage::max(const Glib::RefPtr<Coverage>& other) const
+{
+  pango_coverage_max(const_cast<PangoCoverage*>(gobj()), Glib::unwrap(other));
+}
+G_GNUC_END_IGNORE_DEPRECATIONS
+
 } /* namespace Pango */
diff --git a/pango/src/coverage.hg b/pango/src/coverage.hg
index 747e8e6..734acc8 100644
--- a/pango/src/coverage.hg
+++ b/pango/src/coverage.hg
@@ -1,5 +1,3 @@
-/* $Id: coverage.hg,v 1.1 2003/01/21 13:41:03 murrayc Exp $ */
-
 /* coverage.h
  *
  * Copyright (C) 1998-1999 The gtkmm Development Team
@@ -43,13 +41,19 @@ class Coverage final
   _IGNORE(pango_coverage_to_bytes)
 
 public:
-  _WRAP_METHOD(static Glib::RefPtr<Coverage> create(const guchar* bytes, int n_bytes), 
pango_coverage_from_bytes)
+  // pango_coverage_from_bytes(), pango_coverage_to_bytes() and pango_coverage_max()
+  // are deprecated in pango 1.43, but not in pangomm 2.42.
+  //TODO: Deprecate in pangomm 2.44.
+  _WRAP_METHOD_DOCS_ONLY(pango_coverage_from_bytes)
+  static Glib::RefPtr<Coverage> create(const guchar* bytes, int n_bytes);
 
   //_WRAP_METHOD(Glib::RefPtr<Coverage> copy() const, pango_coverage_copy) //see above
 
   _WRAP_METHOD(CoverageLevel get(int index) const, pango_coverage_get)
   _WRAP_METHOD(void set(int index, CoverageLevel level), pango_coverage_set)
-  _WRAP_METHOD(void max(const Glib::RefPtr<Coverage>& other) const, pango_coverage_max)
+
+  _WRAP_METHOD_DOCS_ONLY(pango_coverage_max)
+  void max(const Glib::RefPtr<Coverage>& other) const;
 
   /** Convert the coverage map into a flat binary format.
    * @return An array of bytes representing the coverage map.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]