[gtksourceviewmm] Deprecate some methods because the corresponding C functions were deprecated.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceviewmm] Deprecate some methods because the corresponding C functions were deprecated.
- Date: Wed, 29 Apr 2015 11:20:20 +0000 (UTC)
commit c5349475ab30ed7744a4ea41004f8ad470e9355f
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Apr 29 13:19:34 2015 +0200
Deprecate some methods because the corresponding C functions were deprecated.
However, I have not managed to disabled all the deprecation warnings where
we need to still use the deprecated API in the implementation of our own
deprecated API.
gtksourceview/src/completion.hg | 2 +-
gtksourceview/src/gutter.hg | 8 ++++----
gtksourceview/src/gutterrendererpixbuf.hg | 12 ++++++++++--
gtksourceview/src/markattributes.hg | 12 ++++++++++--
4 files changed, 25 insertions(+), 9 deletions(-)
---
diff --git a/gtksourceview/src/completion.hg b/gtksourceview/src/completion.hg
index cd92726..ca8e202 100644
--- a/gtksourceview/src/completion.hg
+++ b/gtksourceview/src/completion.hg
@@ -168,7 +168,7 @@ public:
*
* @newin{2,10}
*/
- _WRAP_METHOD(void move_window(const Gtk::TextIter& iter), gtk_source_completion_move_window)
+ _WRAP_METHOD(void move_window(const Gtk::TextIter& iter), gtk_source_completion_move_window, deprecated
"Use SourceCompletionProvider::get_start_iter() instead.")
/** Block interactive completion.
*
diff --git a/gtksourceview/src/gutter.hg b/gtksourceview/src/gutter.hg
index c11d0dc..c431de0 100644
--- a/gtksourceview/src/gutter.hg
+++ b/gtksourceview/src/gutter.hg
@@ -77,7 +77,7 @@ public:
*
* @newin{2,10}
*/
- _WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_window(), gtk_source_gutter_get_window, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_window(), gtk_source_gutter_get_window, refreturn, deprecated
"Use Gtk::TextView::get_window() instead.")
/** Get the Gdk::Window of the gutter.
*
@@ -89,7 +89,7 @@ public:
*
* @newin{2,10}
*/
- _WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_window() const, gtk_source_gutter_get_window,
constversion)
+ _WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_window() const, gtk_source_gutter_get_window,
constversion, deprecated "Use Gtk::TextView::get_window() instead.")
_WRAP_METHOD(void insert(GutterRenderer* renderer, int position), gtk_source_gutter_insert)
@@ -99,11 +99,11 @@ public:
_WRAP_METHOD(void queue_draw(), gtk_source_gutter_queue_draw)
- _WRAP_METHOD(void set_padding(int xpad, int ypad), gtk_source_gutter_set_padding)
+ _WRAP_METHOD(void set_padding(int xpad, int ypad), gtk_source_gutter_set_padding, deprecated "Use
GutterRenderer::set_padding() instead.")
// TODO: create a Padding class.
- _WRAP_METHOD(void get_padding(int& xpad, int& ypad) const, gtk_source_gutter_get_padding)
+ _WRAP_METHOD(void get_padding(int& xpad, int& ypad) const, gtk_source_gutter_get_padding, deprecated "Use
GutterRenderer::get_padding() instead.")
_WRAP_METHOD(GutterRenderer* get_renderer_at_pos(int x, int y), gtk_source_gutter_get_renderer_at_pos,
refreturn)
diff --git a/gtksourceview/src/gutterrendererpixbuf.hg b/gtksourceview/src/gutterrendererpixbuf.hg
index 6dbfa2e..b559fc1 100644
--- a/gtksourceview/src/gutterrendererpixbuf.hg
+++ b/gtksourceview/src/gutterrendererpixbuf.hg
@@ -27,6 +27,14 @@
_DEFS(gtksourceviewmm,gtksourceview)
_PINCLUDE(gtksourceviewmm/private/gutterrenderer_p.h)
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+//Avoid warnings when we use deprecated gtksourceview API in our deprecated wrappers:
+#include <glibmm.h>
+#undef G_DEPRECATED
+#define G_DEPRECATED
+#include <gtksourceview/gtksourcemarkattributes.h>
+#m4 _POP()
+
namespace Gsv
{
@@ -44,9 +52,9 @@ public:
#m4 _CONVERSION(`const Glib::RefPtr<const Gdk::Pixbuf>&', `GdkPixbuf*',
`const_cast<GdkPixbuf*>(Glib::unwrap($3))')
_WRAP_METHOD(void set_pixbuf(const Glib::RefPtr<const Gdk::Pixbuf>& pixbuf),
gtk_source_gutter_renderer_pixbuf_set_pixbuf)
- _WRAP_METHOD(std::string get_stock_id() const, gtk_source_gutter_renderer_pixbuf_get_stock_id)
+ _WRAP_METHOD(std::string get_stock_id() const, gtk_source_gutter_renderer_pixbuf_get_stock_id, deprecated
"This should not be used in newly-written code.")
- _WRAP_METHOD(void set_stock_id(const std::string& stock_id),
gtk_source_gutter_renderer_pixbuf_set_stock_id)
+ _WRAP_METHOD(void set_stock_id(const std::string& stock_id),
gtk_source_gutter_renderer_pixbuf_set_stock_id, deprecated "This should not be used in newly-written code.")
#m4 _CONVERSION(`GIcon*', `Glib::RefPtr<Gio::Icon>', `Glib::wrap($3)')
_WRAP_METHOD(Glib::RefPtr<Gio::Icon> get_icon(), gtk_source_gutter_renderer_pixbuf_get_gicon, refreturn)
diff --git a/gtksourceview/src/markattributes.hg b/gtksourceview/src/markattributes.hg
index cad6b2b..92c63c4 100644
--- a/gtksourceview/src/markattributes.hg
+++ b/gtksourceview/src/markattributes.hg
@@ -27,6 +27,14 @@
_DEFS(gtksourceviewmm,gtksourceview)
_PINCLUDE(glibmm/private/object_p.h)
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+//Avoid warnings when we use deprecated gtksourceview API in our deprecated wrappers:
+#include <glibmm.h>
+#undef G_DEPRECATED
+#define G_DEPRECATED
+#include <gtksourceview/gtksourcemarkattributes.h>
+#m4 _POP()
+
namespace Gio
{
@@ -69,9 +77,9 @@ public:
_WRAP_METHOD(void set_background(const Gdk::RGBA& rgba), gtk_source_mark_attributes_set_background)
- _WRAP_METHOD(std::string get_stock_id() const, gtk_source_mark_attributes_get_stock_id)
+ _WRAP_METHOD(std::string get_stock_id() const, gtk_source_mark_attributes_get_stock_id, deprecated "This
should not be used in newly-written code.")
- _WRAP_METHOD(void set_stock_id(const std::string& stock_id), gtk_source_mark_attributes_set_stock_id)
+ _WRAP_METHOD(void set_stock_id(const std::string& stock_id), gtk_source_mark_attributes_set_stock_id,
deprecated "This should not be used in newly-written code.")
_WRAP_METHOD(void set_icon_name(const std::string& icon_name), gtk_source_mark_attributes_set_icon_name)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]