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
This commit is contained in:
John Luke 2004-01-28 04:08:29 +00:00
parent d4f6f6e928
commit 0dac8ebd48
5 changed files with 27 additions and 4 deletions

View file

@ -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> 2004-01-27 Mike Kestner <mkestner@ximian.com>
* glib/Value.cs : only g_free values we allocate. * glib/Value.cs : only g_free values we allocate.

8
gtk/AccelKey.custom Normal file
View file

@ -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;
}

View file

@ -1,5 +1,8 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<metadata> <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='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='GtkIconSet']/method[@name='GetSizes']" name="hidden">1</attr>
<attr path="/api/namespace/boxed[@cname='GtkSelectionData']" name="opaque">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='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='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']/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='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='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> <attr path="/api/namespace/object[@cname='GtkWindow']/method[@name='GetSize']/*/*[@type='gint*']" name="pass_as">out</attr>

View file

@ -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);
}

View file

@ -9893,7 +9893,7 @@
<parameters> <parameters>
<parameter type="const-gchar*" name="accel_signal" /> <parameter type="const-gchar*" name="accel_signal" />
<parameter type="GtkAccelGroup*" name="accel_group" /> <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="GdkModifierType" name="accel_mods" />
<parameter type="GtkAccelFlags" name="accel_flags" /> <parameter type="GtkAccelFlags" name="accel_flags" />
</parameters> </parameters>
@ -10970,9 +10970,9 @@
<field cname="accel_path_quark" type="GQuark" /> <field cname="accel_path_quark" type="GQuark" />
</struct> </struct>
<struct name="AccelKey" cname="GtkAccelKey"> <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_mods" type="GdkModifierType" />
<field cname="accel_flags" bits="16" type="guint" /> <field cname="accel_flags" bits="16" type="GtkAccelFlags" />
</struct> </struct>
<alias name="Allocation" cname="GtkAllocation" type="GdkRectangle" /> <alias name="Allocation" cname="GtkAllocation" type="GdkRectangle" />
<struct name="Arg" cname="GtkArg" opaque="true"> <struct name="Arg" cname="GtkArg" opaque="true">