Make gtk_accelerator_get_default_mod_mask() return a GdkModifierType

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=313350

diff --git a/docs/reference/gtk/migrating-checklist.sgml b/docs/reference/gtk/migrating-checklist.sgml
index 8b5a58a6c937e3e995e855e546ebc654dcf74885..6acf903be3628a5a87a783d54ba2e17202311c41 100644 (file)
--- a/docs/reference/gtk/migrating-checklist.sgml
+++ b/docs/reference/gtk/migrating-checklist.sgml
@@ -265,7 +265,7 @@ my_widget_expose_event_handler (GtkWidget *widget, GdkEventExpose *event)
 static gboolean
 my_widget_key_press_event_handler (GtkWidget *widget, GdkEventKey *event)
 {
-  guint modifiers;
+  GdkModifierType modifiers;
 
   modifiers = gtk_accelerator_get_default_mod_mask (<!-- -->);
 

diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index e9bbffee1a9621efe2d91f106e0047dbcf249cdb..39c63989e9239ab2aef20083da11cec38fb8c521 100644 (file)
--- 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 b00b0392025bcc23c66d617e7656de07996295aa..5efe4fa87e2b07ce2c561968c89953e2245b5634 100644 (file)
--- 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 --- */