summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorAlberto Garcia <agarcia@igalia.com>2010-10-15 14:46:22 -0400
committerMatthias Clasen <mclasen@redhat.com>2010-10-15 14:46:22 -0400
commit8d05e742120cb0d74f0b3bc9f7bc4a641169df26 (patch)
tree2357160aef482f2febd321947de0ae231e8a7da4 /gtk
parentb5621b3c895630a5e4a0dc9c642cecae6354b451 (diff)
downloadgtk+-8d05e742120cb0d74f0b3bc9f7bc4a641169df26.tar.gz
Make gtk_accelerator_get_default_mod_mask() return a GdkModifierType
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=313350
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkaccelgroup.c2
-rw-r--r--gtk/gtkaccelgroup.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index e9bbffee1a..39c63989e9 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -1461,7 +1461,7 @@ gtk_accelerator_set_default_mod_mask (GdkModifierType default_mod_mask)
*
* Gets the value set by gtk_accelerator_set_default_mod_mask().
*/
-guint
+GdkModifierType
gtk_accelerator_get_default_mod_mask (void)
{
return default_accel_mod_mask;
diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h
index b00b039202..5efe4fa87e 100644
--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.h
@@ -168,7 +168,8 @@ gchar* gtk_accelerator_name (guint accelerator_key,
gchar* gtk_accelerator_get_label (guint accelerator_key,
GdkModifierType accelerator_mods);
void gtk_accelerator_set_default_mod_mask (GdkModifierType default_mod_mask);
-guint gtk_accelerator_get_default_mod_mask (void);
+GdkModifierType
+ gtk_accelerator_get_default_mod_mask (void);
/* --- internal --- */