diff options
| author | Murray Cumming <murrayc@usa.net> | 2003-11-03 09:27:33 +0000 |
|---|---|---|
| committer | Murray Cumming <murrayc@src.gnome.org> | 2003-11-03 09:27:33 +0000 |
| commit | 9f335531a618230436a4f750e8e83b5fd845873d (patch) | |
| tree | 8d4b78334e1921a47a840fa07e0d1d1b9b0e1ab1 /tools | |
| parent | a86081587ca4aa8e090cffcc10dfe62412ed46b9 (diff) | |
| download | glibmm-9f335531a618230436a4f750e8e83b5fd845873d.tar.gz | |
Added init.[h|cc] with Glib::init() so that the gnomemm init() methods do
2003-11-02 Murray Cumming <murrayc@usa.net>
* glib/glibmm/: Added init.[h|cc] with Glib::init() so that the
gnomemm init() methods do not need to initialize gtkmm.
* tools/m4/class_gobject.m4, class_gtkobject.m4: Added
_GMMPROC_PROTECTED_GCLASS macro, needed by libgnomecanvasmm. This
was not previously properly merged from gtkmm2.
* tools/m4/property.m4: Re-added PropertyProxy reference documentation
that did not survive a previous merge from gtkmm2.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/m4/class_gobject.m4 | 13 | ||||
| -rw-r--r-- | tools/m4/class_gtkobject.m4 | 14 | ||||
| -rw-r--r-- | tools/m4/property.m4 | 5 |
3 files changed, 30 insertions, 2 deletions
diff --git a/tools/m4/class_gobject.m4 b/tools/m4/class_gobject.m4 index edcafbe4..8474cdb6 100644 --- a/tools/m4/class_gobject.m4 +++ b/tools/m4/class_gobject.m4 @@ -34,6 +34,14 @@ define(`__BOOL_CUSTOM_WRAP_NEW__',`1') _POP() ') +dnl Gnome::Canvas::CanvasAA::CanvasAA() needs access to the +dnl normally-private canvas_class_ member variable. See comments there. +define(`_GMMPROC_PROTECTED_GCLASS',`dnl +_PUSH() +dnl Define this macro to be tested for later. +define(`__BOOL_PROTECTED_GCLASS__',`1') +_POP() +') dnl Some of the Gdk types are actually direct typedefs of their base type. dnl This means that 2 wrap functions would have the same argument. @@ -172,10 +180,13 @@ public: typedef __CNAME__ BaseObjectType; typedef __REAL_CNAME__`'Class BaseClassType; -private: +m4_ifdef(`__BOOL_PROTECTED_GCLASS__', +`protected:',`dnl else +private:')dnl endif friend class __CPPNAME__`'_Class; static CppClassType `'__BASE__`'_class_; +private: // noncopyable __CPPNAME__`'(const __CPPNAME__&); __CPPNAME__& operator=(const __CPPNAME__&); diff --git a/tools/m4/class_gtkobject.m4 b/tools/m4/class_gtkobject.m4 index 03bd2817..e0d25bf1 100644 --- a/tools/m4/class_gtkobject.m4 +++ b/tools/m4/class_gtkobject.m4 @@ -54,6 +54,15 @@ define(`__BOOL_UNMANAGEABLE__',`$1') _POP() ') +dnl Gnome::Canvas::CanvasAA::CanvasAA() needs access to the +dnl normally-private canvas_class_ member variable. See comments there. +define(`_GMMPROC_PROTECTED_GCLASS',`dnl +_PUSH() +dnl Define this macro to be tested for later. +define(`__BOOL_PROTECTED_GCLASS__',`1') +_POP() +') + dnl dnl _END_CLASS_GTKOBJECT() @@ -163,7 +172,10 @@ public: #ifndef DOXYGEN_SHOULD_SKIP_THIS -private: +m4_ifdef(`__BOOL_PROTECTED_GCLASS__', +`protected:',`dnl else +private:')dnl endif + friend class __CPPNAME__`'_Class; static CppClassType `'__BASE__`'_class_; diff --git a/tools/m4/property.m4 b/tools/m4/property.m4 index cc58b9d0..7daee1ac 100644 --- a/tools/m4/property.m4 +++ b/tools/m4/property.m4 @@ -14,6 +14,11 @@ define(`_PROPERTY_PROXY',`dnl dnl dnl Put spaces around the template parameter if necessary. pushdef(`__PROXY_TYPE__',`dnl +/** + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ Glib::PropertyProxy$3<'ifelse(regexp(_QUOTE($2),`>$'),`-1',_QUOTE($2),` '_QUOTE($2)` ')`>'dnl )dnl __PROXY_TYPE__ property_$1`'(); |