[atkmm] Atk::Text: Deprecate get_text_before_offset(), get_text_after_offset().



commit 2ce0fef0444211683447792e6fbe44ebdd189132
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Tue Jun 25 12:02:44 2013 +0200

    Atk::Text: Deprecate get_text_before_offset(), get_text_after_offset().
    
    * configure.ac: Don't treat the deprecated-declarations warning as an error,
    not even when --enable-warnings=fatal.
    * atk/src/text.hg: Deprecate get_text_before_offset() and
    get_text_after_offset() and the corresponding virtual functions. They have
    been deprecated in atk. Bug #703027.

 ChangeLog       |   10 ++++++++++
 atk/src/text.hg |   16 ++++++++++++++--
 configure.ac    |    2 +-
 3 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7f7ef52..a498e66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-06-25  Kjell Ahlstedt  <kjell ahlstedt bredband net>
+
+       Atk::Text: Deprecate get_text_before_offset(), get_text_after_offset().
+
+       * configure.ac: Don't treat the deprecated-declarations warning as an error,
+       not even when --enable-warnings=fatal.
+       * atk/src/text.hg: Deprecate get_text_before_offset() and
+       get_text_after_offset() and the corresponding virtual functions. They have
+       been deprecated in atk. Bug #703027.
+
 2.22.7:
 
 2012-10-26  José Alburquerque  <jaalburquerque gmail com>
diff --git a/atk/src/text.hg b/atk/src/text.hg
index 08cb54b..d51e113 100644
--- a/atk/src/text.hg
+++ b/atk/src/text.hg
@@ -19,6 +19,10 @@
 
 _DEFS(atkmm,atk)
 
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef ATK_DISABLE_DEPRECATED
+#m4 _POP()
+
 #include <atkmm/component.h> /* for Atk::CoordType */
 #include <glibmm/slisthandle.h>
 #include <atk/atktext.h>
@@ -137,9 +141,9 @@ class Text : public Glib::Interface
 public:
   _WRAP_METHOD(Glib::ustring get_text(int start_offset, int end_offset) const, atk_text_get_text)
   _WRAP_METHOD(gunichar get_character_at_offset(int offset) const, atk_text_get_character_at_offset)
-  _WRAP_METHOD(Glib::ustring get_text_after_offset(int offset, TextBoundary boundary_type, int& 
start_offset, int& end_offset) const, atk_text_get_text_after_offset)
+  _WRAP_METHOD(Glib::ustring get_text_after_offset(int offset, TextBoundary boundary_type, int& 
start_offset, int& end_offset) const, atk_text_get_text_after_offset, deprecated "Use get_text_at_offset() 
instead.")
   _WRAP_METHOD(Glib::ustring get_text_at_offset(int offset, TextBoundary boundary_type, int& start_offset, 
int& end_offset) const, atk_text_get_text_at_offset)
-  _WRAP_METHOD(Glib::ustring get_text_before_offset(int offset, TextBoundary boundary_type, int& 
start_offset, int& end_offset) const, atk_text_get_text_before_offset)
+  _WRAP_METHOD(Glib::ustring get_text_before_offset(int offset, TextBoundary boundary_type, int& 
start_offset, int& end_offset) const, atk_text_get_text_before_offset, deprecated "Use get_text_at_offset() 
instead.")
   _WRAP_METHOD(int get_caret_offset() const, atk_text_get_caret_offset)
   _WRAP_METHOD(void get_character_extents(int offset, int& x, int& y, int& width, int& height, CoordType 
coords) const, atk_text_get_character_extents)
   _WRAP_METHOD(AttributeSet get_run_attributes(int offset, int& start_offset, int& end_offset) const, 
atk_text_get_run_attributes)
@@ -172,9 +176,17 @@ protected:
 
   _WRAP_VFUNC(Glib::ustring get_text(int start_offset, int end_offset) const, get_text)
   _WRAP_VFUNC(gunichar get_character_at_offset(int offset) const, get_character_at_offset)
+
+  /** @deprecated This virtual function is deprecated and it should not be overridden.
+   */
   _WRAP_VFUNC(Glib::ustring get_text_after_offset(int offset, TextBoundary boundary_type, int& start_offset, 
int& end_offset) const, get_text_after_offset)
+
   _WRAP_VFUNC(Glib::ustring get_text_at_offset(int offset, TextBoundary boundary_type, int& start_offset, 
int& end_offset) const, get_text_at_offset)
+
+  /** @deprecated This virtual function is deprecated and it should not be overridden.
+   */
   _WRAP_VFUNC(Glib::ustring get_text_before_offset(int offset, TextBoundary boundary_type, int& 
start_offset, int& end_offset) const, get_text_before_offset)
+
   _WRAP_VFUNC(int get_caret_offset() const, get_caret_offset)
   _WRAP_VFUNC(void get_character_extents(int offset, int& x, int& y, int& width, int& height, CoordType 
coords) const, get_character_extents)
   _WRAP_VFUNC(AtkAttributeSet* get_run_attributes(int offset, int& start_offset, int& end_offset) const, 
get_run_attributes)
diff --git a/configure.ac b/configure.ac
index dfee2a9..a03e1c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ MM_ARG_WITH_TAGFILE_DOC([glibmm-2.4.tag], [glibmm-2.4])
 AC_LANG([C++])
 MM_ARG_ENABLE_WARNINGS([ATKMM_WXXFLAGS],
                        [-Wall],
-                       [-pedantic -Wall -Wextra -Wno-long-long -DGSEAL_ENABLE],
+                       [-pedantic -Wall -Wextra -Wno-long-long -Wno-error=deprecated-declarations 
-DGSEAL_ENABLE],
                        [G ATK GLIBMM])
 
 AC_CONFIG_FILES([Makefile


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