Consistently use GdkModifierType. (#66950, Mark Patton)

Tue Jan 29 21:50:28 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkaccelmap.[ch] gtk/gtkbindings.[ch] gtk/gtkwidget.[ch]:
        Consistently use GdkModifierType. (#66950, Mark Patton)

        * gtk/gtkimagemenuitem.c (gtk_image_menu_item_new_from_stock):
        For consistency with gtk_button_new_from_stock(), fall back
        to gtk_image_menu_item_new_with_mnemnonic(). (#65944,
        Havoc Pennington)

        * gtk/gtkitemfactory.[ch] (gtk_item_factory_path_from_widget):
        Make G_CONST_RETURN. (#68527, Matt Wilson)

1 files changed, 16 insertions, 16 deletions

diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index fcc672ea5..82a128db4 100644
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -109,9 +109,9 @@ binding_entries_compare (gconstpointer  a,
 }
 
 static GtkBindingEntry*
-binding_entry_new (GtkBindingSet *binding_set,
-		   guint          keyval,
-		   guint          modifiers)
+binding_entry_new (GtkBindingSet  *binding_set,
+		   guint           keyval,
+		   GdkModifierType modifiers)
 {
   GtkBindingEntry *entry;
   
@@ -222,8 +222,8 @@ binding_entry_destroy (GtkBindingEntry *entry)
 }
 
 static GtkBindingEntry*
-binding_ht_lookup_list (guint keyval,
-			guint modifiers)
+binding_ht_lookup_list (guint           keyval,
+			GdkModifierType modifiers)
 {
   GtkBindingEntry lookup_entry = { 0 };
   
@@ -237,9 +237,9 @@ binding_ht_lookup_list (guint keyval,
 }
 
 static GtkBindingEntry*
-binding_ht_lookup_entry (GtkBindingSet *set,
-			 guint		keyval,
-			 guint		modifiers)
+binding_ht_lookup_entry (GtkBindingSet  *set,
+			 guint		 keyval,
+			 GdkModifierType modifiers)
 {
   GtkBindingEntry lookup_entry = { 0 };
   GtkBindingEntry *entry;
@@ -542,7 +542,7 @@ gtk_binding_set_find (const gchar    *set_name)
 gboolean
 gtk_binding_set_activate (GtkBindingSet	 *binding_set,
 			  guint		  keyval,
-			  guint		  modifiers,
+			  GdkModifierType modifiers,
 			  GtkObject	 *object)
 {
   GtkBindingEntry *entry;
@@ -564,7 +564,7 @@ gtk_binding_set_activate (GtkBindingSet	 *binding_set,
 void
 gtk_binding_entry_clear (GtkBindingSet	*binding_set,
 			 guint		 keyval,
-			 guint		 modifiers)
+			 GdkModifierType modifiers)
 {
   GtkBindingEntry *entry;
   
@@ -583,7 +583,7 @@ gtk_binding_entry_clear (GtkBindingSet	*binding_set,
 void
 gtk_binding_entry_remove (GtkBindingSet	 *binding_set,
 			  guint		  keyval,
-			  guint		  modifiers)
+			  GdkModifierType modifiers)
 {
   GtkBindingEntry *entry;
   
@@ -600,7 +600,7 @@ gtk_binding_entry_remove (GtkBindingSet	 *binding_set,
 void
 gtk_binding_entry_add_signall (GtkBindingSet  *binding_set,
 			       guint	       keyval,
-			       guint	       modifiers,
+			       GdkModifierType modifiers,
 			       const gchar    *signal_name,
 			       GSList	      *binding_args)
 {
@@ -678,7 +678,7 @@ gtk_binding_entry_add_signall (GtkBindingSet  *binding_set,
 void
 gtk_binding_entry_add_signal (GtkBindingSet  *binding_set,
 			      guint           keyval,
-			      guint           modifiers,
+			      GdkModifierType modifiers,
 			      const gchar    *signal_name,
 			      guint           n_args,
 			      ...)
@@ -920,7 +920,7 @@ gtk_binding_entries_sort_patterns (GtkBindingEntry    *entries,
 gboolean
 gtk_bindings_activate (GtkObject      *object,
 		       guint           keyval,
-		       guint           modifiers)
+		       GdkModifierType modifiers)
 {
   GtkBindingEntry *entries;
   GtkWidget *widget;
@@ -1002,7 +1002,7 @@ static guint
 gtk_binding_parse_signal (GScanner       *scanner,
 			  GtkBindingSet  *binding_set,
 			  guint		  keyval,
-			  guint		  modifiers)
+			  GdkModifierType modifiers)
 {
   gchar *signal;
   guint expected_token = 0;
@@ -1161,7 +1161,7 @@ gtk_binding_parse_bind (GScanner       *scanner,
 			GtkBindingSet  *binding_set)
 {
   guint keyval = 0;
-  guint modifiers = 0;
+  GdkModifierType modifiers = 0;
 
   g_return_val_if_fail (scanner != NULL, G_TOKEN_ERROR);