From 0dac8ebd489db25cfa1085cef737456c19fd4bbf Mon Sep 17 00:00:00 2001
From: John Luke <jluke@mono-cvs.ximian.com>
Date: Wed, 28 Jan 2004 04:08:29 +0000
Subject: [PATCH] 2004-01-27  John Luke  <jluke@cfl.rr.com>

    * gtk/AccelKey.custom: add convenience ctor
    * gtk/Gtk.metadata: revert previous Widget.AddAccelerator change,
    fix AccelKey fields
    * gtk/Widget.custom: add overload for AddAccelerator
    * gtk/gtk-api.xml: regen

svn path=/trunk/gtk-sharp/; revision=22560
---
 ChangeLog           | 8 ++++++++
 gtk/AccelKey.custom | 8 ++++++++
 gtk/Gtk.metadata    | 4 +++-
 gtk/Widget.custom   | 5 +++++
 gtk/gtk-api.xml     | 6 +++---
 5 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 gtk/AccelKey.custom

diff --git a/ChangeLog b/ChangeLog
index fff86064d..09df8698d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-27  John Luke  <jluke@cfl.rr.com>
+
+	* gtk/AccelKey.custom: add convenience ctor
+	* gtk/Gtk.metadata: revert previous Widget.AddAccelerator change,
+	fix AccelKey fields
+	* gtk/Widget.custom: add overload for AddAccelerator
+	* gtk/gtk-api.xml: regen
+	
 2004-01-27  Mike Kestner  <mkestner@ximian.com>
 
 	* glib/Value.cs : only g_free values we allocate.
diff --git a/gtk/AccelKey.custom b/gtk/AccelKey.custom
new file mode 100644
index 000000000..49cc2a44a
--- /dev/null
+++ b/gtk/AccelKey.custom
@@ -0,0 +1,8 @@
+public Gdk.Key Key;
+
+public AccelKey (Gdk.Key key, Gdk.ModifierType mods, Gtk.AccelFlags flags)
+{
+	this.Key = key;
+	this.accel_mods = mods;
+	this.accel_flags = flags;
+}
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index 98b13c0f3..811132a07 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
 <metadata>
+  <attr path="/api/namespace/struct[@cname='GtkAccelKey']/field[@cname='accel_key']" name="type">GdkKey</attr>
+  <attr path="/api/namespace/struct[@cname='GtkAccelKey']/field[@cname='accel_mods']" name="type">GdkModifierType</attr>
+  <attr path="/api/namespace/struct[@cname='GtkAccelKey']/field[@cname='accel_flags']" name="type">GtkAccelFlags</attr>
   <attr path="/api/namespace/boxed[@cname='GtkBorder']" name="hidden">1</attr>
   <attr path="/api/namespace/boxed[@cname='GtkIconSet']/method[@name='GetSizes']" name="hidden">1</attr>
   <attr path="/api/namespace/boxed[@cname='GtkSelectionData']" name="opaque">1</attr>
@@ -261,7 +264,6 @@
   <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='SizeRequest']" name="name">SizeRequested</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='Unmap']" name="name">Unmapped</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='Unrealize']" name="name">Unrealized</attr>
-  <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='AddAccelerator']/parameters/parameter[@name='accel_key']" name="type">GtkAccelKey</attr>
   <attr path="/api/namespace/object[@cname='GtkWindow']/method[@name='GetDefaultSize']/*/*[@type='gint*']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkWindow']/method[@name='GetPosition']/*/*[@type='gint*']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkWindow']/method[@name='GetSize']/*/*[@type='gint*']" name="pass_as">out</attr>
diff --git a/gtk/Widget.custom b/gtk/Widget.custom
index f0e1c0d0a..ac2ea79d5 100644
--- a/gtk/Widget.custom
+++ b/gtk/Widget.custom
@@ -44,3 +44,8 @@ public System.Drawing.Size RequestSize {
 	}
 }
 
+public void AddAccelerator (string accel_signal, AccelGroup accel_group, AccelKey accel_key)
+{
+	this.AddAccelerator (accel_signal, accel_group, (uint) accel_key.Key, accel_key.accel_mods, accel_key.accel_flags);
+
+}
diff --git a/gtk/gtk-api.xml b/gtk/gtk-api.xml
index e3f418d88..59b097f24 100644
--- a/gtk/gtk-api.xml
+++ b/gtk/gtk-api.xml
@@ -9893,7 +9893,7 @@
         <parameters>
           <parameter type="const-gchar*" name="accel_signal" />
           <parameter type="GtkAccelGroup*" name="accel_group" />
-          <parameter name="accel_key" type="GtkAccelKey" />
+          <parameter type="guint" name="accel_key" />
           <parameter type="GdkModifierType" name="accel_mods" />
           <parameter type="GtkAccelFlags" name="accel_flags" />
         </parameters>
@@ -10970,9 +10970,9 @@
       <field cname="accel_path_quark" type="GQuark" />
     </struct>
     <struct name="AccelKey" cname="GtkAccelKey">
-      <field cname="accel_key" type="guint" />
+      <field cname="accel_key" type="GdkKey" />
       <field cname="accel_mods" type="GdkModifierType" />
-      <field cname="accel_flags" bits="16" type="guint" />
+      <field cname="accel_flags" bits="16" type="GtkAccelFlags" />
     </struct>
     <alias name="Allocation" cname="GtkAllocation" type="GdkRectangle" />
     <struct name="Arg" cname="GtkArg" opaque="true">