diff options
author | José Alburquerque <jaalburqu@svn.gnome.org> | 2012-02-22 14:36:25 -0500 |
---|---|---|
committer | José Alburquerque <jaalburqu@svn.gnome.org> | 2012-02-22 15:33:43 -0500 |
commit | 59ab32d4e40baabe21901f9893e07cb0fdd3b268 (patch) | |
tree | 28bc45303f537b6f301b1f21cecd8fd369fa651f | |
parent | 80ebe9230d21ab3aabf4ba1de05ccb4efe09079f (diff) | |
download | glibmm-59ab32d4e40baabe21901f9893e07cb0fdd3b268.tar.gz |
Gio::Application: Derive from the ActionGroup interface.
* gio/src/application.hg: As is done in the C API.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | gio/src/application.hg | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2012-02-22 José Alburquerque <jaalburquerque@gmail.com> + + Gio::Application: Derive from the ActionGroup interface. + + * gio/src/application.hg: As is done in the C API. + 2.31.18: 2012-02-20 José Alburquerque <jaalburquerque@gmail.com> diff --git a/gio/src/application.hg b/gio/src/application.hg index 60b8aa13..9c231b53 100644 --- a/gio/src/application.hg +++ b/gio/src/application.hg @@ -17,6 +17,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <giomm/actiongroup.h> #include <giomm/actionmap.h> #include <giomm/applicationcommandline.h> #include <giomm/file.h> @@ -31,8 +32,6 @@ namespace Gio _WRAP_ENUM(ApplicationFlags, GApplicationFlags, NO_GTYPE) -class ActionGroup; - /** Application - Core application class. * An Application is the foundation of an application, unique for a given * application identifier. The Application class wraps some low-level @@ -79,9 +78,10 @@ class ActionGroup; * * @newin{2,32} */ -class Application : public Glib::Object, public ActionMap +class Application : public Glib::Object, public ActionGroup, public ActionMap { _CLASS_GOBJECT(Application, GApplication, G_APPLICATION, Glib::Object, GObject) + _IMPLEMENTS_INTERFACE(ActionGroup) _IMPLEMENTS_INTERFACE(ActionMap) protected: |