[gtkmm/gtkmm-3-22] class_gtkobject.m4|object.h: Fix GtkObject→GObject
- From: Daniel Boles <dboles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm/gtkmm-3-22] class_gtkobject.m4|object.h: Fix GtkObject→GObject
- Date: Mon, 9 Oct 2017 23:03:18 +0000 (UTC)
commit 8f07d24e81770a99f89fae688e3af39cb563b990
Author: Daniel Boles <dboles src gmail com>
Date: Mon Oct 9 20:15:01 2017 +0100
class_gtkobject.m4|object.h: Fix GtkObject→GObject
GtkObject was moved down to the GLib level, as GObject, 2 versions ago.
https://bugzilla.gnome.org/show_bug.cgi?id=788587
gtk/gtkmm/object.h | 4 ++--
tools/m4/class_gtkobject.m4 | 6 ++----
2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkmm/object.h b/gtk/gtkmm/object.h
index c72d6fc..a9bd4af 100644
--- a/gtk/gtkmm/object.h
+++ b/gtk/gtkmm/object.h
@@ -100,10 +100,10 @@ public:
static GType get_base_type() G_GNUC_CONST;
#endif
- ///Provides access to the underlying C GtkObject.
+ /// Provides access to the underlying C GObject.
GObject* gobj() { return reinterpret_cast<GObject*>(gobject_); }
- ///Provides access to the underlying C GtkObject.
+ /// Provides access to the underlying C GObject.
const GObject* gobj() const { return reinterpret_cast<GObject*>(gobject_); }
public:
diff --git a/tools/m4/class_gtkobject.m4 b/tools/m4/class_gtkobject.m4
index 220e15c..acb09fa 100644
--- a/tools/m4/class_gtkobject.m4
+++ b/tools/m4/class_gtkobject.m4
@@ -272,10 +272,10 @@ ifdef(`__BOOL_DYNAMIC_GTYPE_REGISTRATION__',`
static GType get_base_type() G_GNUC_CONST;
#endif
- ///Provides access to the underlying C GtkObject.
+ /// Provides access to the underlying C GObject.
__CNAME__* gobj() { return reinterpret_cast<__CNAME__*>(gobject_); }
- ///Provides access to the underlying C GtkObject.
+ /// Provides access to the underlying C GObject.
const __CNAME__* gobj() const { return reinterpret_cast<__CNAME__*>(gobject_); }
_H_VFUNCS_AND_SIGNALS()
@@ -284,5 +284,3 @@ private:
_IMPORT(SECTION_CLASS2)
')
-
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]