* sources/Gnome.metadata:

(CanvasItem.SetValist):
(CanvasItem.Construct): Hidden, because we don't support va_list
params.
	(CanvasItem): Hid the constructor, as each subclass has their own
contsructor and we don't support va_list params.
	(CanvasItem.W2i):
(CanvasItem.I2w): Marked parameters as ref, so they can be used as
in/out parameters.
	(Canvas.GetMiterPoints):
(Canvas.GetColor): Fixed return type to be 'bool' instead of 'int'.
	(CanvasClipgroup.Wind): Fixed property type. It should be an
Art.WindRule enum, not a UInt.
	(Canvas.W2cAffine):
(CanvasItem.AffineAbsolute):
(CanvasItem.AffineRelative):
(CanvasItem.I2wAffine):
(CanvasItem.I2cAffine): Hidden, use the impl. in the custom file
instead.
	* gnome/Canvas.custom: Added for W2cAffine.
* gnome/CanvasItem.custom: Reformatted. Added AffineRelative,
AffineAbsolute, I2wAffine, I2cAffine. These are needed because of
the 'const double affine[6]' parameter.

svn path=/trunk/gtk-sharp/; revision=16876
This commit is contained in:
Duncan Mak 2003-07-30 06:36:18 +00:00
parent b9b7cf319b
commit 4d5ffe430c
5 changed files with 187 additions and 32 deletions

View file

@ -1,3 +1,35 @@
2003-07-30 Duncan Mak <duncan@ximian.com>
* sources/Gnome.metadata:
(CanvasItem.SetValist):
(CanvasItem.Construct): Hidden, because we don't support va_list
params.
(CanvasItem): Hid the constructor, as each subclass has their own
contsructor and we don't support va_list params.
(CanvasItem.W2i):
(CanvasItem.I2w): Marked parameters as ref, so they can be used as
in/out parameters.
(Canvas.GetMiterPoints):
(Canvas.GetColor): Fixed return type to be 'bool' instead of 'int'.
(CanvasClipgroup.Wind): Fixed property type. It should be an
Art.WindRule enum, not a UInt.
(Canvas.W2cAffine):
(CanvasItem.AffineAbsolute):
(CanvasItem.AffineRelative):
(CanvasItem.I2wAffine):
(CanvasItem.I2cAffine): Hidden, use the impl. in the custom file
instead.
* gnome/Canvas.custom: Added for W2cAffine.
* gnome/CanvasItem.custom: Reformatted. Added AffineRelative,
AffineAbsolute, I2wAffine, I2cAffine. These are needed because of
the 'const double affine[6]' parameter.
2003-07-29 Duncan Mak <duncan@ximian.com>
* sources/Gtk.metadata:

View file

@ -753,7 +753,7 @@
<return-type type="gboolean"/>
</method>
<method name="GetColor" cname="gnome_canvas_get_color">
<return-type type="int"/>
<return-type type="gboolean"/>
<parameters>
<parameter type="const-char*" name="spec"/>
<parameter type="GdkColor*" name="color" pass_as="out"/>
@ -776,7 +776,7 @@
</parameters>
</method>
<method name="GetMiterPoints" cname="gnome_canvas_get_miter_points" shared="true">
<return-type type="int"/>
<return-type type="gboolean"/>
<parameters>
<parameter type="double" name="x1"/>
<parameter type="double" name="y1"/>
@ -921,7 +921,7 @@
<parameter type="int*" name="cy" pass_as="out"/>
</parameters>
</method>
<method name="W2cAffine" cname="gnome_canvas_w2c_affine">
<method name="W2cAffine" cname="gnome_canvas_w2c_affine" hidden="1">
<return-type type="void"/>
<parameters>
<parameter type="double" array="true" name="affine"/>
@ -950,7 +950,7 @@
<parameters>
<parameter type="double" name="worldx"/>
<parameter type="double" name="worldy"/>
<parameter type="double*" name="winx"/>
<parameter type="double*" name="winx" pass_as="out"/>
<parameter type="double*" name="winy" pass_as="out"/>
</parameters>
</method>
@ -966,7 +966,7 @@
<field cname="wind" type="ArtWindRule"/>
<field cname="svp" type="ArtSVP*"/>
<property name="Path" cname="path" type="gpointer" readable="true" writeable="true"/>
<property name="Wind" cname="wind" type="guint" readable="true" writeable="true"/>
<property name="Wind" cname="wind" type="ArtWindRule" readable="true" writeable="true"/>
<method name="GetType" cname="gnome_canvas_clipgroup_get_type" shared="true">
<return-type type="GType"/>
</method>
@ -1001,19 +1001,19 @@
<parameter type="GdkEvent*" name="event"/>
</parameters>
</signal>
<method name="AffineAbsolute" cname="gnome_canvas_item_affine_absolute">
<method name="AffineAbsolute" cname="gnome_canvas_item_affine_absolute" hidden="1">
<return-type type="void"/>
<parameters>
<parameter type="const-double" array="true" name="affine"/>
</parameters>
</method>
<method name="AffineRelative" cname="gnome_canvas_item_affine_relative">
<method name="AffineRelative" cname="gnome_canvas_item_affine_relative" hidden="1">
<return-type type="void"/>
<parameters>
<parameter type="const-double" array="true" name="affine"/>
</parameters>
</method>
<method name="Construct" cname="gnome_canvas_item_construct">
<method name="Construct" cname="gnome_canvas_item_construct" hidden="1">
<return-type type="void"/>
<parameters>
<parameter type="GnomeCanvasGroup*" name="parent"/>
@ -1047,7 +1047,7 @@
<method name="Hide" cname="gnome_canvas_item_hide">
<return-type type="void"/>
</method>
<method name="I2cAffine" cname="gnome_canvas_item_i2c_affine">
<method name="I2cAffine" cname="gnome_canvas_item_i2c_affine" hidden="1">
<return-type type="void"/>
<parameters>
<parameter type="double" array="true" name="affine"/>
@ -1056,11 +1056,11 @@
<method name="I2w" cname="gnome_canvas_item_i2w">
<return-type type="void"/>
<parameters>
<parameter type="double*" name="x"/>
<parameter type="double*" name="y"/>
<parameter type="double*" name="x" pass_as="ref"/>
<parameter type="double*" name="y" pass_as="ref"/>
</parameters>
</method>
<method name="I2wAffine" cname="gnome_canvas_item_i2w_affine">
<method name="I2wAffine" cname="gnome_canvas_item_i2w_affine" hidden="1">
<return-type type="void"/>
<parameters>
<parameter type="double" array="true" name="affine"/>
@ -1124,7 +1124,7 @@
<parameter ellipsis="true"/>
</parameters>
</method>
<method name="SetValist" cname="gnome_canvas_item_set_valist">
<method name="SetValist" cname="gnome_canvas_item_set_valist" hidden="1">
<return-type type="void"/>
<parameters>
<parameter type="const-gchar*" name="first_arg_name"/>
@ -1158,8 +1158,8 @@
<method name="W2i" cname="gnome_canvas_item_w2i">
<return-type type="void"/>
<parameters>
<parameter type="double*" name="x"/>
<parameter type="double*" name="y"/>
<parameter type="double*" name="x" pass_as="ref"/>
<parameter type="double*" name="y" pass_as="ref"/>
</parameters>
</method>
</object>

17
gnome/Canvas.custom Normal file
View file

@ -0,0 +1,17 @@
//
// Gnome.Canvas.custom - Gnome Canvas class customizations
//
// Author: Duncan Mak (duncan@ximian.com)
//
// Copyright (C) 2003 Duncan Mak
//
// This code is inserted after the automatically generated code.
//
[DllImport("gnomecanvas-2")]
static extern void gnome_canvas_w2c_affine(IntPtr raw, double[] affine);
public void W2cAffine(out double[] affine) {
affine = new double [6];
gnome_canvas_w2c_affine(Handle, affine);
}

View file

@ -7,8 +7,6 @@
//
// This code is inserted after the automatically generated code.
//
[DllImport("gnomecanvas-2")]
static extern System.IntPtr gnome_canvas_item_new (IntPtr group, uint type, IntPtr null_terminator);
@ -26,3 +24,36 @@ static extern IntPtr gtksharp_gnome_canvas_item_get_canvas (IntPtr i);
public Canvas Canvas {
get { return GLib.Object.GetObject (gtksharp_gnome_canvas_item_get_canvas (this.Handle), false) as Canvas; }
}
[DllImport("gnomecanvas-2")]
static extern void gnome_canvas_item_affine_relative(IntPtr raw, double[] affine);
public void AffineRelative (out double[] affine) {
affine = new double [6];
gnome_canvas_item_affine_relative(Handle, affine);
}
[DllImport("gnomecanvas-2")]
static extern void gnome_canvas_item_affine_absolute(IntPtr raw, double[] affine);
public void AffineAbsolute (out double[] affine) {
affine = new double [6];
gnome_canvas_item_affine_absolute(Handle, affine);
}
[DllImport("gnomecanvas-2")]
static extern void gnome_canvas_item_i2c_affine(IntPtr raw, double[] affine);
public void I2cAffine(out double[] affine) {
affine = new double [6];
gnome_canvas_item_i2c_affine(Handle, affine);
}
[DllImport("gnomecanvas-2")]
static extern void gnome_canvas_item_i2w_affine(IntPtr raw, double[] affine);
public void I2wAffine(out double[] affine) {
affine = new double [6];
gnome_canvas_item_i2w_affine(Handle, affine);
}

View file

@ -250,6 +250,44 @@
</attribute>
</data>
</rule>
<rule>
<class name="GnomeCanvas">
<method>W2cAffine</method>
</class>
<data>
<attribute target="method">
<name>hidden</name>
<value>1</value>
</attribute>
</data>
</rule>
<rule>
<class name="GnomeCanvasItem">
<method>AffineRelative</method>
<method>AffineAbsolute</method>
<method>I2wAffine</method>
<method>I2cAffine</method>
<method>SetValist</method>
<method>Construct</method>
</class>
<data>
<attribute target="method">
<name>hidden</name>
<value>1</value>
</attribute>
</data>
</rule>
<rule>
<class name="GnomeCanvasItem">
<constructor>gnome_canvas_item_new</constructor>
</class>
<data>
<attribute target="constructor">
<name>hidden</name>
<value>1</value>
</attribute>
</data>
</rule>
<!-- misc -->
<rule>
@ -316,6 +354,21 @@
</data>
</rule>
<!-- ref parameters -->
<rule>
<class name="GnomeCanvasItem">
<method>W2i</method>
<method>I2w</method>
</class>
<data>
<attribute target="param">
<filter level="type">double*</filter>
<name>pass_as</name>
<value>ref</value>
</attribute>
</data>
</rule>
<!-- out parameters -->
<rule>
<class name="GnomeCanvas">
@ -390,8 +443,6 @@
<name>pass_as</name>
<value>out</value>
</attribute>
</data>
<data>
<attribute target="param">
<filter level="name">winy</filter>
<name>pass_as</name>
@ -490,4 +541,28 @@
</data>
</rule>
<!-- fix return values -->
<rule>
<class name="GnomeCanvas">
<method>GetMiterPoints</method>
<method>GetColor</method>
</class>
<data>
<attribute target="return">
<name>type</name>
<value>gboolean</value>
</attribute>
</data>
</rule>
<rule>
<class name="GnomeCanvasClipgroup">
<property>Wind</property>
</class>
<data>
<attribute target="property">
<name>type</name>
<value>ArtWindRule</value>
</attribute>
</data>
</rule>
</metadata>