diff options
author | Szilárd Pfeiffer <szilard.pfeiffer@gmail.com> | 2008-07-29 09:03:09 +0000 |
---|---|---|
committer | Murray Cumming <murrayc@src.gnome.org> | 2008-07-29 09:03:09 +0000 |
commit | e74b63cfa3ad05e586d95c6ed8a6fc86c36f885b (patch) | |
tree | 039153c461fb5d11e435ffb8ebd45bbd741b2a44 /glib/glibmm | |
parent | 10914083179b01e8ab0086d01005f2afd7296e56 (diff) | |
download | glibmm-e74b63cfa3ad05e586d95c6ed8a6fc86c36f885b.tar.gz |
Make the callbacks take a Tree<> instead of just the data, so they can use
2008-07-29 Szilárd Pfeiffer <szilard.pfeiffer@gmail.com>
* glib/src/tree.hg: Make the callbacks take a Tree<> instead of just
the data, so they can use methods on the tree (which can be a node
in the tree).
gobject_: Make this protected.
Provide the this pointer as data to g_node_new() so we can retrieve
it later.
Removed children_ and parent_ because we don't need a separate store now that
we can get the C++ instance from the gobject instance.
owns_gobject_: Removed because it is was always true, so the gobject was
always destroyed (and still is).
* tests/glibmm_tree/main.cc: Updated for the changed API.
Bug #520778.
svn path=/trunk/; revision=697
Diffstat (limited to 'glib/glibmm')
-rw-r--r-- | glib/glibmm/objectbase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glib/glibmm/objectbase.h b/glib/glibmm/objectbase.h index 7341960d..b1beda04 100644 --- a/glib/glibmm/objectbase.h +++ b/glib/glibmm/objectbase.h @@ -136,10 +136,10 @@ public: */ virtual void unreference() const; - ///Provides access to the underlying C GtkObject. + ///Provides access to the underlying C GObject. inline GObject* gobj() { return gobject_; } - ///Provides access to the underlying C GtkObject. + ///Provides access to the underlying C GObject. inline const GObject* gobj() const { return gobject_; } /// Give a ref-ed copy to someone. Use for direct struct access. |