summaryrefslogtreecommitdiff
path: root/gio/src/actiongroup.hg
diff options
context:
space:
mode:
authorJosé Alburquerque <jaalburqu@svn.gnome.org>2012-09-30 23:18:08 -0400
committerJosé Alburquerque <jaalburqu@svn.gnome.org>2012-09-30 23:18:08 -0400
commitd694160400455f2156f4b298c7f34bb1616ec894 (patch)
tree1bd8cfd222f7a0dd5cda73e013b1786af0fa66ae /gio/src/actiongroup.hg
parent2f382211f52ab2ae806eeb1a6cc5cd72047a15e4 (diff)
downloadglibmm-d694160400455f2156f4b298c7f34bb1616ec894.tar.gz
ActionGroup: Add the query_action() methods.
* tools/m4/base.m4: * tools/m4/convert_base.m4: * tools/m4/filelist.am: * tools/m4/initialize.m4: * tools/m4/initialize_base.m4: * tools/m4/initialize_gio.m4: * tools/m4/initialize_glib.m4: * tools/m4/initialize_glibmm.m4: Move the _INITIALIZE macros into their own files as is done for the _CONVERT macros so that some basic types that are common (like initializing a bool& from a gboolean) can be defined once and used in other circumstances. * gio/src/dbusconnection.hg: Move an _INITIALIZATION macro to the general files above (the gio initialize file). * gio/src/actiongroup.hg: Add the query_action() methods (the needed _INITIALIZATION macros are in the glib initialize file). * tools/pm/Output.pm (convert_args_cpp_to_c): Correct the indentation of the declarations of the C output variables and the setting of the C++ output parameters from the C variables for methods that use the output parameter feature of gmmproc.
Diffstat (limited to 'gio/src/actiongroup.hg')
-rw-r--r--gio/src/actiongroup.hg3
1 files changed, 3 insertions, 0 deletions
diff --git a/gio/src/actiongroup.hg b/gio/src/actiongroup.hg
index 195af00b..777fb869 100644
--- a/gio/src/actiongroup.hg
+++ b/gio/src/actiongroup.hg
@@ -33,6 +33,7 @@ namespace Glib
class VariantBase;
class VariantContainerBase;
+class VariantType;
}
@@ -65,6 +66,8 @@ public:
#m4 _CONVERSION(`gchar**',`std::vector<Glib::ustring>',`Glib::ArrayHandler<Glib::ustring>::array_to_vector($3, Glib::OWNERSHIP_DEEP)')
_WRAP_METHOD(std::vector<Glib::ustring> list_actions() const, g_action_group_list_actions)
+ _WRAP_METHOD(bool query_action(const Glib::ustring& action_name, bool& enabled{>>}, Glib::VariantType& parameter_type{>>?}, Glib::VariantBase& state_hint{.>>}, Glib::VariantType& state_type{.>>?}, Glib::VariantBase& state{.>>?}), g_action_group_query_action)
+
_WRAP_METHOD(bool get_action_enabled(const Glib::ustring& action_name) const, g_action_group_get_action_enabled)
_WRAP_METHOD(Glib::VariantType get_action_parameter_type(const Glib::ustring& action_name) const, g_action_group_get_action_parameter_type)