[gtkmm] Scrollable, ScrolledWindow: Fix Adjustment reference counting.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Scrollable, ScrolledWindow: Fix Adjustment reference counting.
- Date: Mon, 29 Nov 2010 09:46:06 +0000 (UTC)
commit 3a6a068c4be871e2973083d8d0debcd5dd64a1c9
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Nov 29 10:42:34 2010 +0100
Scrollable, ScrolledWindow: Fix Adjustment reference counting.
* gtk/src/scrollable.hg:get_hadjustment(), get_vadjustment():
* gtk/src/scrolledwindow.hg: get_hadjustment(), get_vadjustment():
Use refereturn to fix the reference-counting on these, which was broken
since we changed Adjustment to be a Glib::Object instead of a Gtk::Object.
ChangeLog | 9 +++++++++
gtk/src/scrollable.hg | 8 ++++----
gtk/src/scrolledwindow.hg | 8 ++++----
3 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 62678a9..fc04297 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-29 Murray Cumming <murrayc murrayc com>
+
+ Scrollable, ScrolledWindow: Fix Adjustment reference counting.
+
+ * gtk/src/scrollable.hg:get_hadjustment(), get_vadjustment():
+ * gtk/src/scrolledwindow.hg: get_hadjustment(), get_vadjustment():
+ Use refereturn to fix the reference-counting on these, which was broken
+ since we changed Adjustment to be a Glib::Object instead of a Gtk::Object.
+
2010-11-26 Murray Cumming <murrayc murrayc com>
Fix the build with the latest GTK+.
diff --git a/gtk/src/scrollable.hg b/gtk/src/scrollable.hg
index 608fed1..056653f 100644
--- a/gtk/src/scrollable.hg
+++ b/gtk/src/scrollable.hg
@@ -43,8 +43,8 @@ class Scrollable : public Glib::Interface
_CLASS_INTERFACE(Scrollable, GtkScrollable, GTK_SCROLLABLE, GtkScrollableInterface)
public:
- _WRAP_METHOD(Glib::RefPtr<Adjustment> get_hadjustment(), gtk_scrollable_get_hadjustment)
- _WRAP_METHOD(Glib::RefPtr<const Adjustment> get_hadjustment() const, gtk_scrollable_get_hadjustment)
+ _WRAP_METHOD(Glib::RefPtr<Adjustment> get_hadjustment(), gtk_scrollable_get_hadjustment, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<const Adjustment> get_hadjustment() const, gtk_scrollable_get_hadjustment, refreturn, constversion)
_WRAP_METHOD(void set_hadjustment(const Glib::RefPtr<Adjustment>& hadjustment), gtk_scrollable_set_hadjustment)
@@ -53,8 +53,8 @@ public:
*/
void unset_hadjustment();
- _WRAP_METHOD(Glib::RefPtr<Adjustment> get_vadjustment(), gtk_scrollable_get_vadjustment)
- _WRAP_METHOD(Glib::RefPtr<const Adjustment> get_vadjustment() const, gtk_scrollable_get_vadjustment)
+ _WRAP_METHOD(Glib::RefPtr<Adjustment> get_vadjustment(), gtk_scrollable_get_vadjustment, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<const Adjustment> get_vadjustment() const, gtk_scrollable_get_vadjustment, refreturn, constversoin)
_WRAP_METHOD(void set_vadjustment(const Glib::RefPtr<Adjustment>& hadjustment), gtk_scrollable_set_vadjustment)
diff --git a/gtk/src/scrolledwindow.hg b/gtk/src/scrolledwindow.hg
index b162e0c..e84c58f 100644
--- a/gtk/src/scrolledwindow.hg
+++ b/gtk/src/scrolledwindow.hg
@@ -59,10 +59,10 @@ public:
_WRAP_METHOD(void set_hadjustment(const Glib::RefPtr<Adjustment>& hadjustment), gtk_scrolled_window_set_hadjustment)
_WRAP_METHOD(void set_vadjustment(const Glib::RefPtr<Adjustment>& vadjustment), gtk_scrolled_window_set_vadjustment)
- _WRAP_METHOD(Glib::RefPtr<Adjustment> get_hadjustment(), gtk_scrolled_window_get_hadjustment)
- _WRAP_METHOD(Glib::RefPtr<const Adjustment> get_hadjustment() const, gtk_scrolled_window_get_hadjustment, constversion)
- _WRAP_METHOD(Glib::RefPtr<Adjustment> get_vadjustment(), gtk_scrolled_window_get_vadjustment)
- _WRAP_METHOD(Glib::RefPtr<const Adjustment> get_vadjustment() const, gtk_scrolled_window_get_vadjustment, constversion)
+ _WRAP_METHOD(Glib::RefPtr<Adjustment> get_hadjustment(), gtk_scrolled_window_get_hadjustment, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<const Adjustment> get_hadjustment() const, gtk_scrolled_window_get_hadjustment, refreturn, constversion)
+ _WRAP_METHOD(Glib::RefPtr<Adjustment> get_vadjustment(), gtk_scrolled_window_get_vadjustment, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<const Adjustment> get_vadjustment() const, gtk_scrolled_window_get_vadjustment, refreturn, constversion)
_WRAP_METHOD(void set_policy(PolicyType hscrollbar_policy, PolicyType vscrollbar_policy), gtk_scrolled_window_set_policy)
_WRAP_METHOD(void get_policy(PolicyType& hscrollbar_policy, PolicyType& vscrollbar_policy) const, gtk_scrolled_window_get_policy)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]