diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2008-02-04 20:27:38 +0000 |
|---|---|---|
| committer | Murray Cumming <murrayc@src.gnome.org> | 2008-02-04 20:27:38 +0000 |
| commit | c13ac7ff2769eb5ee1bf58918b9b701b09efc7de (patch) | |
| tree | 3afa24a06bddbb1157e88eb113cad869b6a63e91 /gio/src/loadableicon.ccg | |
| parent | e550522f04d727e79b12e50ac00754e4735048b3 (diff) | |
| download | glibmm-c13ac7ff2769eb5ee1bf58918b9b701b09efc7de.tar.gz | |
Allow _CLASS_INTERFACE() to take two extra optional paremeters to specify
2008-02-04 Murray Cumming <murrayc@murrayc.com>
* tools/m4/class_interface.m4: Allow _CLASS_INTERFACE() to take two
extra optional paremeters to specify the base class, so that appropriate
code is generated when we derive from another Interface - which seems
appropriate when the GInterface has a prerequisite.
* gio/src/loadableicon.ccg:
* gio/src/loadableicon.hg: Derive from Icon, because it is a prerequisite
of this interface. Use the extra _CLASS_INTERFACE() parameters.
* gio/src/fileicon.hg: Do not derive from Icon because that happens
through LoadableIcon now. But do use _IMPLEMENTS_INTERFACE(Icon) here,
because only a Glib::Object can actually implement an interface.
svn path=/trunk/; revision=580
Diffstat (limited to 'gio/src/loadableicon.ccg')
| -rw-r--r-- | gio/src/loadableicon.ccg | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gio/src/loadableicon.ccg b/gio/src/loadableicon.ccg index 91563623..2a60328a 100644 --- a/gio/src/loadableicon.ccg +++ b/gio/src/loadableicon.ccg @@ -18,9 +18,11 @@ */ #include <gio/gio.h> +#include <giomm/private/icon_p.h> #include "slot_async.h" -namespace Gio { +namespace Gio +{ #ifdef GLIBMM_EXCEPTIONS_ENABLED Glib::RefPtr<InputStream> |