The-Homebrew-Cloud/Ryujinx-GtkSharp
2
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2024-07-11 14:41:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

2004-02-10 Mike Kestner <mkestner@ximian.com>

Browse Source 
* art/Art.metadata : mark a field private
	* art/art-api.xml : regen
	* gda/Gda.metadata : mark a few structs opaque
	* gda/gda-api.xml : regen
	* gdk/*.custom : fix changed field names
	* gdk/gdk-api.xml : regen
	* generator/Field.cs : StudlyCase simple typed field names.
	* gnome/Gnome.metadata : mark FontEntry.weight private to
	avoid collision with Weight field. s|//|/api/namespace|g
	* gnome/gnome-api.xml : regen
	* gtk/Gtk.metadata : rename AccelKey.accel_key to key to
	avoid collision with type name.
	* gtk/*.custom : fix changed field names
	* gtk/gtk-api.xml : regen
	* pango/pango-api.xml : regen
	* parser/gapi_pp.pl : add a private_regex to hide BACKEND
	and ENGINE apis, which are by convention private.
	* sample/* : make compile
	* sample/GtkDemo/* : make compile
	* sample/test/* : make compile
	* sources/gtk-sharp-sources.xml : exclude a bunch of pango
	source files.

svn path=/trunk/gtk-sharp/; revision=22947
This commit is contained in:
Mike Kestner 2004-02-10 16:04:50 +00:00
parent ced4bb91d9
commit d41f6593b0
43 changed files with 288 additions and 986 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ChangeLog
View File

@ -1,3 +1,28 @@
2004-02-10 Mike Kestner <mkestner@ximian.com>
* art/Art.metadata : mark a field private
* art/art-api.xml : regen
* gda/Gda.metadata : mark a few structs opaque
* gda/gda-api.xml : regen
* gdk/*.custom : fix changed field names
* gdk/gdk-api.xml : regen
* generator/Field.cs : StudlyCase simple typed field names.
* gnome/Gnome.metadata : mark FontEntry.weight private to
avoid collision with Weight field. s|//|/api/namespace|g
* gnome/gnome-api.xml : regen
* gtk/Gtk.metadata : rename AccelKey.accel_key to key to
avoid collision with type name.
* gtk/*.custom : fix changed field names
* gtk/gtk-api.xml : regen
* pango/pango-api.xml : regen
* parser/gapi_pp.pl : add a private_regex to hide BACKEND
and ENGINE apis, which are by convention private.
* sample/* : make compile
* sample/GtkDemo/* : make compile
* sample/test/* : make compile
* sources/gtk-sharp-sources.xml : exclude a bunch of pango
source files.
2004-02-07 Mike Kestner <mkestner@ximian.com>
* configure.in : tagged 0.16 and bumped cvs version.

1
art/Art.metadata
View File

@ -3,5 +3,6 @@
<attr path="//class[@cname='ArtAffine_']/method[@name='ToString']" name="name">ToStringArray</attr>
<attr path="//struct[@cname='ArtGradientStop']/field[@cname='color']" name="array_len">17</attr>
<attr path="//struct[@cname='ArtRender']/field[@cname='clear_color']" name="array_len">17</attr>
<attr path="//struct[@cname='ArtRender']/field[@cname='clear']" name="access">private</attr>
<attr path="//struct[@cname='ArtVpathDash']" name="opaque">1</attr>
</metadata>

2
art/art-api.xml
View File

@ -314,7 +314,7 @@
<field cname="n_chan" type="int" />
<field cname="depth" type="int" />
<field cname="alpha_type" type="ArtAlphaType" />
<field cname="clear" type="art_boolean" />
<field cname="clear" type="art_boolean" access="private" />
<field cname="clear_color" type="ArtPixMaxDepth" array_len="17" />
<field cname="opacity" type="art_u32" />
<field cname="compositing_mode" type="ArtCompositingMode" />

4
gda/Gda.metadata
View File

@ -13,6 +13,8 @@
<attr path="//object[@cname='GdaDataModelHash']/method[@name='SetNColumns']" name="new_flag">1</attr>
<attr path="//object[@cname='GdaExport']" name="hidden">1</attr>
<attr path="//object[@cname='GdaXmlDatabase']/signal[@name='Changed']" name="name">DataChanged</attr>
<attr path="//struct[@cname='ArtVpathDash']" name="opaque">1</attr>
<attr path="//struct[@cname='GdaCommand']" name="opaque">1</attr>
<attr path="//struct[@cname='GdaFieldAttributes']" name="opaque">1</attr>
<attr path="//struct[@cname='GdaParameter']" name="opaque">1</attr>
</metadata>

6
gda/gda-api.xml
View File

@ -1313,7 +1313,7 @@
</parameters>
</method>
</struct>
<struct name="Command" cname="GdaCommand">
<struct name="Command" cname="GdaCommand" opaque="1">
<field cname="text" type="gchar*" />
<field cname="type" type="GdaCommandType" />
<field cname="options" type="GdaCommandOptions" />
@ -1383,7 +1383,7 @@
<field cname="value" type="GdaValue*" />
<field cname="attributes" type="GdaFieldAttributes*" />
</struct>
<struct name="FieldAttributes" cname="GdaFieldAttributes">
<struct name="FieldAttributes" cname="GdaFieldAttributes" opaque="1">
<field cname="defined_size" type="gint" />
<field cname="name" type="gchar*" />
<field cname="table" type="gchar*" />
@ -1527,7 +1527,7 @@
<field cname="precision" type="glong" />
<field cname="width" type="glong" />
</struct>
<struct name="Parameter" cname="GdaParameter">
<struct name="Parameter" cname="GdaParameter" opaque="1">
<field cname="name" type="gchar*" />
<field cname="value" type="GdaValue*" />
<method name="Free" cname="gda_parameter_free">

18
gdk/Color.custom
View File

@ -10,15 +10,15 @@
public override string ToString ()
{
return String.Format ("rgb:{0:x}/{1:x}/{2:x}", red, green, blue);
return String.Format ("rgb:{0:x}/{1:x}/{2:x}", Red, Green, Blue);
}
public Color (byte r, byte g, byte b)
{
red = (ushort) (r << 8 | r);
green = (ushort) (g << 8 | g);
blue = (ushort) (b << 8 | b);
pixel = 0;
Red = (ushort) (r << 8 | r);
Green = (ushort) (g << 8 | g);
Blue = (ushort) (b << 8 | b);
Pixel = 0;
}
public Color (System.Drawing.Color color)
@ -28,10 +28,10 @@ public Color (System.Drawing.Color color)
g = color.G;
b = color.B;
red = (ushort) (r << 8 | r);
green = (ushort) (g << 8 | g);
blue = (ushort) (b << 8 | b);
pixel = 0;
Red = (ushort) (r << 8 | r);
Green = (ushort) (g << 8 | g);
Blue = (ushort) (b << 8 | b);
Pixel = 0;
}
[DllImport("libgdk-win32-2.0-0.dll")]

2
gdk/DeviceAxis.custom
View File

@ -18,7 +18,7 @@
public override string ToString ()
{
return "Gdk.DeviceAxis, max:" + this.max + ",min:" + this.min;
return "Gdk.DeviceAxis, max:" + this.Max + ",min:" + this.Min;
}

2
gdk/Drawable.custom
View File

@ -17,7 +17,7 @@ public System.Drawing.Size Size {
public void DrawRectangle(Gdk.GC gc, bool filled, Gdk.Rectangle area)
{
gdk_draw_rectangle(Handle, gc.Handle, filled, area.x, area.y, area.width, area.height);
gdk_draw_rectangle(Handle, gc.Handle, filled, area.X, area.Y, area.Width, area.Height);
}
public void DrawRectangle(Gdk.GC gc, bool filled, System.Drawing.Rectangle area)

2
gdk/EventKey.custom
View File

@ -22,6 +22,6 @@ public static GLib.GType GType {
public Gdk.Key Key {
get {
return (Gdk.Key) this.keyval;
return (Gdk.Key) this.Keyval;
}
}

6
gdk/Point.custom
View File

@ -18,7 +18,7 @@
public override string ToString ()
{
return String.Format ("({0},{1})", x, y);
return String.Format ("({0},{1})", X, Y);
}
/// <summary>
@ -32,6 +32,6 @@ public override string ToString ()
public Point (int x, int y)
{
this.x = x;
this.y = y;
this.X = x;
this.Y = y;
}

12
gdk/Rectangle.custom
View File

@ -18,19 +18,19 @@
public override string ToString ()
{
return String.Format ("{0}x{1}+{2}+{3}", width, height, x, y);
return String.Format ("{0}x{1}+{2}+{3}", Width, Height, X, Y);
}
public Rectangle (int x, int y, int width, int height)
{
this.x = x;
this.y = y;
this.width = width;
this.height = height;
this.X = x;
this.Y = y;
this.Width = width;
this.Height = height;
}
public static implicit operator System.Drawing.Rectangle (Gdk.Rectangle rect)
{
return new System.Drawing.Rectangle (rect.x, rect.y, rect.width, rect.height);
return new System.Drawing.Rectangle (rect.X, rect.Y, rect.Width, rect.Height);
}

2
gdk/Window.custom
View File

@ -10,7 +10,7 @@
get {
Gdk.Rectangle rect = Gdk.Rectangle.Zero;
gdk_window_get_frame_extents (Handle, ref rect);
return new System.Drawing.Rectangle (rect.x, rect.y, rect.width, rect.height);
return new System.Drawing.Rectangle (rect.X, rect.Y, rect.Width, rect.Height);
}
}

150
gdk/gdk-api.xml
View File

@ -3585,9 +3585,6 @@
<member cname="GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION" name="UnsupportedOperation" />
<member cname="GDK_PIXBUF_ERROR_FAILED" name="Failed" />
</enum>
<enum name="PixbufFormatFlags" cname="GdkPixbufFormatFlags" type="flags">
<member cname="GDK_PIXBUF_FORMAT_WRITABLE" name="Writable" value="1 &lt;&lt; 0" />
</enum>
<enum name="PixbufFrameAction" cname="GdkPixbufFrameAction" type="enum">
<member cname="GDK_PIXBUF_FRAME_RETAIN" name="Retain" />
<member cname="GDK_PIXBUF_FRAME_DISPOSE" name="Dispose" />
@ -3620,45 +3617,6 @@
<parameter type="gpointer" name="data" />
</parameters>
</callback>
<callback name="PixbufModuleFillInfoFunc" cname="GdkPixbufModuleFillInfoFunc">
<return-type type="void" />
<parameters>
<parameter type="GdkPixbufFormat*" name="info" />
</parameters>
</callback>
<callback name="PixbufModuleFillVtableFunc" cname="GdkPixbufModuleFillVtableFunc">
<return-type type="void" />
<parameters>
<parameter type="GdkPixbufModule*" name="module" />
</parameters>
</callback>
<callback name="PixbufModulePreparedFunc" cname="GdkPixbufModulePreparedFunc">
<return-type type="void" />
<parameters>
<parameter type="GdkPixbuf*" name="pixbuf" />
<parameter type="GdkPixbufAnimation*" name="anim" />
<parameter type="gpointer" name="user_data" />
</parameters>
</callback>
<callback name="PixbufModuleSizeFunc" cname="GdkPixbufModuleSizeFunc">
<return-type type="void" />
<parameters>
<parameter type="gint*" name="width" />
<parameter type="gint*" name="height" />
<parameter type="gpointer" name="user_data" />
</parameters>
</callback>
<callback name="PixbufModuleUpdatedFunc" cname="GdkPixbufModuleUpdatedFunc">
<return-type type="void" />
<parameters>
<parameter type="GdkPixbuf*" name="pixbuf" />
<parameter type="int" name="x" />
<parameter type="int" name="y" />
<parameter type="int" name="width" />
<parameter type="int" name="height" />
<parameter type="gpointer" name="user_data" />
</parameters>
</callback>
<object name="Pixbuf" cname="GdkPixbuf" parent="GObject">
<method name="AddAlpha" cname="gdk_pixbuf_add_alpha" hidden="1">
<return-type type="GdkPixbuf*" />
@ -3862,9 +3820,6 @@
<parameter type="int" name="height" />
</parameters>
</constructor>
<method name="NonAnimNew" cname="gdk_pixbuf_non_anim_new">
<return-type type="GdkPixbufAnimation*" />
</method>
<method name="RenderPixmapAndMask" cname="gdk_pixbuf_render_pixmap_and_mask" library="libgdk-win32-2.0-0.dll">
<return-type type="void" />
<parameters>
@ -3978,13 +3933,6 @@
<parameter type="GdkInterpType" name="interp_type" />
</parameters>
</method>
<method name="SetOption" cname="gdk_pixbuf_set_option">
<return-type type="gboolean" />
<parameters>
<parameter type="const-gchar*" name="key" />
<parameter type="const-gchar*" name="value" />
</parameters>
</method>
</object>
<object name="PixbufAnimation" cname="GdkPixbufAnimation" parent="GObject">
<method name="GetHeight" cname="gdk_pixbuf_animation_get_height">
@ -4164,14 +4112,7 @@
</parameters>
</method>
</object>
<struct name="PixbufFormat" cname="GdkPixbufFormat">
<field cname="name" type="gchar*" />
<field cname="signature" type="GdkPixbufModulePattern*" />
<field cname="domain" type="gchar*" />
<field cname="description" type="gchar*" />
<field cname="mime_types" type="gchar**" />
<field cname="extensions" type="gchar**" />
<field cname="flags" type="guint32" />
<struct name="PixbufFormat" cname="GdkPixbufFormat" opaque="true">
<method name="GetDescription" cname="gdk_pixbuf_format_get_description">
<return-type type="gchar*" />
</method>
@ -4200,95 +4141,6 @@
<field cname="composited" type="GdkPixbuf*" />
<field cname="revert" type="GdkPixbuf*" />
</struct>
<struct name="PixbufModule" cname="GdkPixbufModule">
<field cname="module_name" type="char*" />
<field cname="module_path" type="char*" />
<field cname="module" type="GModule*" />
<field cname="info" type="GdkPixbufFormat*" />
<callback cname="load">
<return-type type="GdkPixbuf*" />
<parameters>
<parameter type="FILE*" name="f,GError**" />
</parameters>
</callback>
<callback cname="load_xpm_data">
<return-type type="GdkPixbuf*" />
<parameters>
<parameter type="const-char**" name="data" />
</parameters>
</callback>
<callback cname="begin_load">
<return-type type="gpointer" />
<parameters>
<parameter type="GdkPixbufModuleSizeFunc" name="size_func,GdkPixbufModulePreparedFunc" />
</parameters>
</callback>
<callback cname="stop_load">
<return-type type="gboolean" />
<parameters>
<parameter type="gpointer" name="context,GError**" />
</parameters>
</callback>
<callback cname="load_increment">
<return-type type="gboolean" />
<parameters>
<parameter type="gpointer" name="context,const-guchar*" />
</parameters>
</callback>
<callback cname="load_animation">
<return-type type="GdkPixbufAnimation*" />
<parameters>
<parameter type="FILE*" name="f,GError**" />
</parameters>
</callback>
<callback cname="save">
<return-type type="gboolean" />
<parameters>
<parameter type="FILE*" name="f,GdkPixbuf*" />
</parameters>
</callback>
<callback cname="_reserved1">
<return-type type="void" />
<parameters>
<parameter type="void" name="arg1" />
</parameters>
</callback>
<callback cname="_reserved2">
<return-type type="void" />
<parameters>
<parameter type="void" name="arg1" />
</parameters>
</callback>
<callback cname="_reserved3">
<return-type type="void" />
<parameters>
<parameter type="void" name="arg1" />
</parameters>
</callback>
<callback cname="_reserved4">
<return-type type="void" />
<parameters>
<parameter type="void" name="arg1" />
</parameters>
</callback>
<callback cname="_reserved5">
<return-type type="void" />
<parameters>
<parameter type="void" name="arg1" />
</parameters>
</callback>
<callback cname="_reserved6">
<return-type type="void" />
<parameters>
<parameter type="void" name="arg1" />
</parameters>
</callback>
</struct>
<struct name="PixbufModulePattern" cname="GdkPixbufModulePattern">
<field cname="prefix" type="unsigned char*" />
<field cname="mask" type="unsigned char*" />
<field cname="relevance" type="int" />
</struct>
<struct name="Pixdata" cname="GdkPixdata">
<field cname="magic" type="guint32" />
<field cname="length" type="gint32" />

10
generator/Field.cs
View File

@ -21,6 +21,12 @@ namespace GtkSharp.Generation {
this.elem = elem;
}
public string Access {
get {
return elem.HasAttribute ("access") ? elem.GetAttribute ("access") : "public";
}
}
public int ArrayLength {
get {
if (!IsArray)
@ -170,8 +176,10 @@ namespace GtkSharp.Generation {
} else if (IsPointer && CSType != "string") {
// FIXME: probably some fields here which should be visible.
sw.WriteLine ("\t\tprivate {0} {1};", CSType, Name);
} else if (Access != "public") {
sw.WriteLine ("\t\t{0} {1} {2};", Access, CSType, Name);
} else {
sw.WriteLine ("\t\tpublic {0} {1};", CSType, Name);
sw.WriteLine ("\t\tpublic {0} {1};", CSType, StudlyName);
}
return true;

171
gnome/Gnome.metadata
View File

@ -1,89 +1,90 @@
<?xml version="1.0"?>
<metadata>
<attr path="//boxed[@cname='GnomeCanvasPoints']" name="opaque">1</attr>
<attr path="//boxed[@cname='GnomeGlyphList']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="//boxed[@cname='GnomePrintUnit']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="//boxed[@cname='GnomePrintUnit']/method[@name='GetIdentity']/*/*[@name='base']" name="name">Base</attr>
<attr path="//class[@cname='GnomeConfig_']/method[@name='SetSetHandler']" name="hidden">1</attr>
<attr path="//class[@cname='GnomeConfig_']/method[@name='SetSyncHandler']" name="hidden">1</attr>
<attr path="//class[@cname='GnomeGdk_']" name="name">GdkHelper</attr>
<attr path="//class[@cname='GnomeGtk_']" name="name">GtkHelper</attr>
<attr path="//class[@cname='GnomePrint_']/method/*/*[@name='in']" name="type">const-gchar*</attr>
<attr path="//class[@cname='GnomePrint_']/method/*/*[@name='text']" name="type">const-gchar*</attr>
<attr path="//class[@cname='GnomePrint_']/method/*/*[@name='name']" name="type">const-gchar*</attr>
<attr path="//object[@cname='GnomeAbout']/constructor[@cname='gnome_about_new']/*/*[@type='const-gchar**']" name="array">1</attr>
<attr path="//object[@cname='GnomeAbout']/constructor[@cname='gnome_about_new']/*/*[@name='logo_pixbuf']" name="null_ok">1</attr>
<attr path="//object[@cname='GnomeAppBar']/signal[@name='ClearPrompt']" name="name">PromptCleared</attr>
<attr path="//object[@cname='GnomeCanvas']/method[@name='C2w']/*/*[@type='double*']" name="pass_as">out</attr>
<attr path="//object[@cname='GnomeCanvas']/method[@name='GetButtPoints']/*/*[@type='double*']" name="pass_as">out</attr>
<attr path="//object[@cname='GnomeCanvas']/method[@name='GetColor']/return-type" name="type">gboolean</attr>
<attr path="//object[@cname='GnomeCanvas']/method[@name='GetColor']/*/*[@type='GdkColor*']" name="pass_as">out</attr>
<attr path="//object[@cname='GnomeCanvas']/method[@name='GetMiterPoints']/return-type" name="type">gboolean</attr>
<attr path="//object[@cname='GnomeCanvas']/method[@name='GetMiterPoints']/*/*[@type='double*']" name="pass_as">out</attr>
<attr path="//object[@cname='GnomeCanvas']/method[@name='GetScrollOffsets']/*/*[@type='int*']" name="pass_as">out</attr>
<attr path="//object[@cname='GnomeCanvas']/method[@name='GetScrollRegion']/*/*[@type='double*']" name="pass_as">out</attr>
<attr path="//object[@cname='GnomeCanvas']/method[@name='W2c']/*/*[@type='int*']" name="pass_as">out</attr>
<attr path="//object[@cname='GnomeCanvas']/method[@name='W2cD']/*/*[@type='double*']" name="pass_as">out</attr>
<attr path="//object[@cname='GnomeCanvas']/method[@name='WindowToWorld']/*/*[@type='double*']" name="pass_as">out</attr>
<attr path="//object[@cname='GnomeCanvas']/method[@name='WorldToWindow']/*/*[@type='double*']" name="pass_as">out</attr>
<attr path="//object[@cname='GnomeCanvas']/method[@name='W2cAffine']" name="hidden">1</attr>
<attr path="//object[@cname='GnomeCanvasClipgroup']/property[@name='Wind']" name="type">ArtWindRule</attr>
<attr path="//object[@cname='GnomeCanvasItem']/constructor[@cname='gnome_canvas_item_new']" name="hidden">1</attr>
<attr path="//object[@cname='GnomeCanvasItem']/method[@name='AffineAbsolute']" name="hidden">1</attr>
<attr path="//object[@cname='GnomeCanvasItem']/method[@name='AffineRelative']" name="hidden">1</attr>
<attr path="//object[@cname='GnomeCanvasItem']/method[@name='Construct']" name="hidden">1</attr>
<attr path="//object[@cname='GnomeCanvasItem']/method[@name='GetBounds']/*/*[@type='double*']" name="pass_as">out</attr>
<attr path="//object[@cname='GnomeCanvasItem']/method[@name='I2cAffine']" name="hidden">1</attr>
<attr path="//object[@cname='GnomeCanvasItem']/method[@name='I2w']/*/*[@type='double*']" name="pass_as">ref</attr>
<attr path="//object[@cname='GnomeCanvasItem']/method[@name='I2wAffine']" name="hidden">1</attr>
<attr path="//object[@cname='GnomeCanvasItem']/method[@name='SetValist']" name="hidden">1</attr>
<attr path="//object[@cname='GnomeCanvasItem']/method[@name='W2i']/*/*[@type='double*']" name="pass_as">ref</attr>
<attr path="//object[@cname='GnomeCanvasItem']/signal[@name='Event']" name="name">CanvasEvent</attr>
<attr path="//object[@cname='GnomeCanvasRichText']/method[@name='GetIterLocation']/*/*[@name='location']" name="pass_as">out</attr>
<attr path="//object[@cname='GnomeCanvasRichText']/method[@name='GetIterAtLocation']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="//object[@cname='GnomeCanvasShape']/property[@name='Dash']" name="type">ArtVpathDash</attr>
<attr path="//object[@cname='GnomeClient']/signal[@name='Connect']" name="name">Connected</attr>
<attr path="//object[@cname='GnomeClient']/signal[@name='Disconnect']" name="name">Disconnected</attr>
<attr path="//object[@cname='GnomeDruidPage']/signal[@name='Back']" name="name">BackClicked</attr>
<attr path="//object[@cname='GnomeDruidPage']/signal[@name='Cancel']" name="name">CancelClicked</attr>
<attr path="//object[@cname='GnomeDruidPage']/signal[@name='Finish']" name="name">FinishClicked</attr>
<attr path="//object[@cname='GnomeDruidPage']/signal[@name='Next']" name="name">NextClicked</attr>
<attr path="//object[@cname='GnomeDruidPage']/signal[@name='Prepare']" name="name">Prepared</attr>
<attr path="//object[@cname='GnomeEntry']/method[@name='GtkEntry']" name="name">GetGtkEntry</attr>
<attr path="//object[@cname='GnomeEntry']/signal[@name='Activate']" name="name">Activated</attr>
<attr path="//object[@cname='GnomeFileEntry']/method[@name='GnomeEntry']" name="hidden">1</attr>
<attr path="//object[@cname='GnomeFileEntry']/method[@name='GtkEntry']" name="hidden">1</attr>
<attr path="//object[@cname='GnomeFileEntry']/signal[@name='Activate']" name="name">Activated</attr>
<attr path="//object[@cname='GnomeFont']/method/return-type[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="//object[@cname='GnomeFont']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="//object[@cname='GnomeFontPreview']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="//object[@cname='GnomeFontFace']/method/return-type[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="//object[@cname='GnomeFontFace']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="/api/namespace/boxed[@cname='GnomeCanvasPoints']" name="opaque">1</attr>
<attr path="/api/namespace/boxed[@cname='GnomeGlyphList']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="/api/namespace/boxed[@cname='GnomePrintUnit']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="/api/namespace/boxed[@cname='GnomePrintUnit']/method[@name='GetIdentity']/*/*[@name='base']" name="name">Base</attr>
<attr path="/api/namespace/class[@cname='GnomeConfig_']/method[@name='SetSetHandler']" name="hidden">1</attr>
<attr path="/api/namespace/class[@cname='GnomeConfig_']/method[@name='SetSyncHandler']" name="hidden">1</attr>
<attr path="/api/namespace/class[@cname='GnomeGdk_']" name="name">GdkHelper</attr>
<attr path="/api/namespace/class[@cname='GnomeGtk_']" name="name">GtkHelper</attr>
<attr path="/api/namespace/class[@cname='GnomePrint_']/method/*/*[@name='in']" name="type">const-gchar*</attr>
<attr path="/api/namespace/class[@cname='GnomePrint_']/method/*/*[@name='text']" name="type">const-gchar*</attr>
<attr path="/api/namespace/class[@cname='GnomePrint_']/method/*/*[@name='name']" name="type">const-gchar*</attr>
<attr path="/api/namespace/object[@cname='GnomeAbout']/constructor[@cname='gnome_about_new']/*/*[@type='const-gchar**']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GnomeAbout']/constructor[@cname='gnome_about_new']/*/*[@name='logo_pixbuf']" name="null_ok">1</attr>
<attr path="/api/namespace/object[@cname='GnomeAppBar']/signal[@name='ClearPrompt']" name="name">PromptCleared</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='C2w']/*/*[@type='double*']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='GetButtPoints']/*/*[@type='double*']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='GetColor']/return-type" name="type">gboolean</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='GetColor']/*/*[@type='GdkColor*']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='GetMiterPoints']/return-type" name="type">gboolean</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='GetMiterPoints']/*/*[@type='double*']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='GetScrollOffsets']/*/*[@type='int*']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='GetScrollRegion']/*/*[@type='double*']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='W2c']/*/*[@type='int*']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='W2cD']/*/*[@type='double*']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='WindowToWorld']/*/*[@type='double*']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='WorldToWindow']/*/*[@type='double*']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='W2cAffine']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvasClipgroup']/property[@name='Wind']" name="type">ArtWindRule</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvasItem']/constructor[@cname='gnome_canvas_item_new']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvasItem']/method[@name='AffineAbsolute']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvasItem']/method[@name='AffineRelative']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvasItem']/method[@name='Construct']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvasItem']/method[@name='GetBounds']/*/*[@type='double*']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvasItem']/method[@name='I2cAffine']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvasItem']/method[@name='I2w']/*/*[@type='double*']" name="pass_as">ref</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvasItem']/method[@name='I2wAffine']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvasItem']/method[@name='SetValist']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvasItem']/method[@name='W2i']/*/*[@type='double*']" name="pass_as">ref</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvasItem']/signal[@name='Event']" name="name">CanvasEvent</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvasRichText']/method[@name='GetIterLocation']/*/*[@name='location']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvasRichText']/method[@name='GetIterAtLocation']/*/*[@name='iter']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GnomeCanvasShape']/property[@name='Dash']" name="type">ArtVpathDash</attr>
<attr path="/api/namespace/object[@cname='GnomeClient']/signal[@name='Connect']" name="name">Connected</attr>
<attr path="/api/namespace/object[@cname='GnomeClient']/signal[@name='Disconnect']" name="name">Disconnected</attr>
<attr path="/api/namespace/object[@cname='GnomeDruidPage']/signal[@name='Back']" name="name">BackClicked</attr>
<attr path="/api/namespace/object[@cname='GnomeDruidPage']/signal[@name='Cancel']" name="name">CancelClicked</attr>
<attr path="/api/namespace/object[@cname='GnomeDruidPage']/signal[@name='Finish']" name="name">FinishClicked</attr>
<attr path="/api/namespace/object[@cname='GnomeDruidPage']/signal[@name='Next']" name="name">NextClicked</attr>
<attr path="/api/namespace/object[@cname='GnomeDruidPage']/signal[@name='Prepare']" name="name">Prepared</attr>
<attr path="/api/namespace/object[@cname='GnomeEntry']/method[@name='GtkEntry']" name="name">GetGtkEntry</attr>
<attr path="/api/namespace/object[@cname='GnomeEntry']/signal[@name='Activate']" name="name">Activated</attr>
<attr path="/api/namespace/object[@cname='GnomeFileEntry']/method[@name='GnomeEntry']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomeFileEntry']/method[@name='GtkEntry']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomeFileEntry']/signal[@name='Activate']" name="name">Activated</attr>
<attr path="/api/namespace/object[@cname='GnomeFont']/method/return-type[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="/api/namespace/object[@cname='GnomeFont']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="/api/namespace/object[@cname='GnomeFontPreview']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="/api/namespace/object[@cname='GnomeFontFace']/method/return-type[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="/api/namespace/object[@cname='GnomeFontFace']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="/api/namespace/class[@cname='GnomeIcon_']/method[@name='LookupSync']/*/*[@name='thumbnail_factory']" name="null_ok">1</attr>
<attr path="//object[@cname='GnomeIconEntry']/method[@name='PickDialog']" name="hidden">1</attr>
<attr path="//object[@cname='GnomeIconList']/constructor[@cname='gnome_icon_list_new']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
<attr path="//object[@cname='GnomeIconList']/method[@name='GetSelection']/return-type" name="element_type">int</attr>
<attr path="//object[@cname='GnomeIconList']/method[@name='SetHadjustment']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
<attr path="//object[@cname='GnomeIconList']/method[@name='SetVadjustment']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
<attr path="//object[@cname='GnomeIconList']/signal[@name='FocusIcon']" name="name">IconFocused</attr>
<attr path="//object[@cname='GnomeIconList']/signal[@name='SelectIcon']" name="name">IconSelected</attr>
<attr path="//object[@cname='GnomeIconList']/signal[@name='UnselectIcon']" name="name">IconUnselected</attr>
<attr path="//object[@cname='GnomeIconTheme']/method[@name='GetSearchPath']" name="hidden">1</attr>
<attr path="//object[@cname='GnomePrintConfig']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="//object[@cname='GnomePrintConfig']/method[@name='Get']/return-type" name="type">gchar*</attr>
<attr path="//object[@cname='GnomePrintDialog']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="//object[@cname='GnomePrintDialog']/constructor[@cname='gnome_print_dialog_new']/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="//object[@cname='GnomePrintDialog']/constructor[@cname='gnome_print_dialog_new']/*/*[@name='flags']" name="type">GnomePrintDialogFlags</attr>
<attr path="//object[@cname='GnomePrintJob']" name="disabledefaultconstructor">1</attr>
<attr path="//object[@cname='GnomePrintJobPreview']/constructor/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="//object[@cname='GnomePrintMeta']/method/*/*[@name='filename']" name="type">const-gchar*</attr>
<attr path="//object[@cname='GnomePrintPdf']" name="parent">GObject</attr>
<attr path="//object[@cname='GnomePrintTransport']" name="parent">GObject</attr>
<attr path="//object[@cname='GPAOptionMenu']/constructor/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="//struct[@cname='GnomeCanvasPathDef']/method[@name='Curveto']" name="name">CurveTo</attr>
<attr path="//struct[@cname='GnomeCanvasPathDef']/method[@name='Lineto']" name="name">LineTo</attr>
<attr path="//struct[@cname='GnomeCanvasPathDef']/method[@name='LinetoMoving']" name="name">LineToMoving</attr>
<attr path="//struct[@cname='GnomeCanvasPathDef']/method[@name='Moveto']" name="name">MoveTo</attr>
<attr path="//struct[@cname='GnomeCanvasPathDef']/method[@name='Split']/return-type" name="element_type">Gnome.CanvasPathDef</attr>
<attr path="//struct[@cname='GnomePrintPaper']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="/api/namespace/object[@cname='GnomeIconEntry']/method[@name='PickDialog']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomeIconList']/constructor[@cname='gnome_icon_list_new']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
<attr path="/api/namespace/object[@cname='GnomeIconList']/method[@name='GetSelection']/return-type" name="element_type">int</attr>
<attr path="/api/namespace/object[@cname='GnomeIconList']/method[@name='SetHadjustment']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
<attr path="/api/namespace/object[@cname='GnomeIconList']/method[@name='SetVadjustment']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
<attr path="/api/namespace/object[@cname='GnomeIconList']/signal[@name='FocusIcon']" name="name">IconFocused</attr>
<attr path="/api/namespace/object[@cname='GnomeIconList']/signal[@name='SelectIcon']" name="name">IconSelected</attr>
<attr path="/api/namespace/object[@cname='GnomeIconList']/signal[@name='UnselectIcon']" name="name">IconUnselected</attr>
<attr path="/api/namespace/object[@cname='GnomeIconTheme']/method[@name='GetSearchPath']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomePrintConfig']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="/api/namespace/object[@cname='GnomePrintConfig']/method[@name='Get']/return-type" name="type">gchar*</attr>
<attr path="/api/namespace/object[@cname='GnomePrintDialog']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="/api/namespace/object[@cname='GnomePrintDialog']/constructor[@cname='gnome_print_dialog_new']/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="/api/namespace/object[@cname='GnomePrintDialog']/constructor[@cname='gnome_print_dialog_new']/*/*[@name='flags']" name="type">GnomePrintDialogFlags</attr>
<attr path="/api/namespace/object[@cname='GnomePrintJob']" name="disabledefaultconstructor">1</attr>
<attr path="/api/namespace/object[@cname='GnomePrintJobPreview']/constructor/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="/api/namespace/object[@cname='GnomePrintMeta']/method/*/*[@name='filename']" name="type">const-gchar*</attr>
<attr path="/api/namespace/object[@cname='GnomePrintPdf']" name="parent">GObject</attr>
<attr path="/api/namespace/object[@cname='GnomePrintTransport']" name="parent">GObject</attr>
<attr path="/api/namespace/object[@cname='GPAOptionMenu']/constructor/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="/api/namespace/struct[@cname='GnomeCanvasPathDef']/method[@name='Curveto']" name="name">CurveTo</attr>
<attr path="/api/namespace/struct[@cname='GnomeCanvasPathDef']/method[@name='Lineto']" name="name">LineTo</attr>
<attr path="/api/namespace/struct[@cname='GnomeCanvasPathDef']/method[@name='LinetoMoving']" name="name">LineToMoving</attr>
<attr path="/api/namespace/struct[@cname='GnomeCanvasPathDef']/method[@name='Moveto']" name="name">MoveTo</attr>
<attr path="/api/namespace/struct[@cname='GnomeCanvasPathDef']/method[@name='Split']/return-type" name="element_type">Gnome.CanvasPathDef</attr>
<attr path="/api/namespace/struct[@cname='GPFontEntry']/field[@cname='weight']" name="access">private</attr>
<attr path="/api/namespace/struct[@cname='GnomePrintPaper']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
</metadata>

2
gnome/gnome-api.xml
View File

@ -5365,7 +5365,7 @@
<field cname="familyname" type="gchar*" />
<field cname="speciesname" type="gchar*" />
<field cname="file" type="gchar*" />
<field cname="weight" type="gchar*" />
<field cname="weight" type="gchar*" access="private" />
<field cname="italic_angle" type="gint" />
<field cname="Weight" type="GnomeFontWeight" />
<field cname="is_alias" type="gboolean" />

4
gtk/AccelKey.custom
View File

@ -3,6 +3,6 @@ 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;
this.AccelMods = mods;
this.AccelFlags = flags;
}

1
gtk/Gtk.metadata
View File

@ -1,6 +1,7 @@
<?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='key']" name="cname">key</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>

6
gtk/TargetEntry.custom
View File

@ -9,7 +9,7 @@
public TargetEntry (string target, Gtk.TargetFlags flags, uint info)
{
this.target = target;
this.flags = flags;
this.info = info;
this.Target = target;
this.Flags = flags;
this.Info = info;
}

4
gtk/TreeIter.custom
View File

@ -3,7 +3,7 @@
//
public override int GetHashCode ()
{
return stamp;
return Stamp;
}
public override bool Equals (object o)
@ -14,7 +14,7 @@
if (!(o is TreeIter))
return false;
TreeIter ti = (TreeIter) o;
return ti.stamp == stamp &&
return ti.Stamp == Stamp &&
ti._user_data == _user_data &&
ti._user_data2 == _user_data2 &&
ti._user_data3 == _user_data3;

2
gtk/Widget.custom
View File

@ -46,6 +46,6 @@ 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);
this.AddAccelerator (accel_signal, accel_group, (uint) accel_key.Key, accel_key.AccelMods, accel_key.AccelFlags);
}

614
pango/pango-api.xml
View File

@ -49,10 +49,6 @@
<member cname="PANGO_FONT_MASK_STRETCH" name="Stretch" value="1 &lt;&lt; 4" />
<member cname="PANGO_FONT_MASK_SIZE" name="Size" value="1 &lt;&lt; 5" />
</enum>
<enum name="OTTableType" cname="PangoOTTableType" type="enum">
<member cname="PANGO_OT_TABLE_GSUB" name="Gsub" />
<member cname="PANGO_OT_TABLE_GPOS" name="Gpos" />
</enum>
<enum name="Stretch" cname="PangoStretch" type="enum">
<member cname="PANGO_STRETCH_ULTRA_CONDENSED" name="UltraCondensed" />
<member cname="PANGO_STRETCH_EXTRA_CONDENSED" name="ExtraCondensed" />
@ -109,28 +105,6 @@
<parameter type="gpointer" name="data" />
</parameters>
</callback>
<callback name="FreeGCFunc" cname="PangoFreeGCFunc">
<return-type type="void" />
<parameters>
<parameter type="PangoContext*" name="context" />
<parameter type="GC" name="gc" />
</parameters>
</callback>
<callback name="GetGCFunc" cname="PangoGetGCFunc">
<return-type type="GC" />
<parameters>
<parameter type="PangoContext*" name="context" />
<parameter type="PangoColor*" name="color" />
<parameter type="GC" name="base_gc" />
</parameters>
</callback>
<callback name="XftSubstituteFunc" cname="PangoXftSubstituteFunc">
<return-type type="void" />
<parameters>
<parameter type="FcPattern*" name="pattern" />
<parameter type="gpointer" name="data" />
</parameters>
</callback>
<object name="Context" cname="PangoContext" parent="GObject">
<method name="GetBaseDir" cname="pango_context_get_base_dir">
<return-type type="PangoDirection" />
@ -171,7 +145,6 @@
<parameter type="PangoLanguage*" name="language" />
</parameters>
</method>
<constructor cname="pango_context_new" />
<method name="SetBaseDir" cname="pango_context_set_base_dir">
<return-type type="void" />
<parameters>
@ -184,12 +157,6 @@
<parameter type="const-PangoFontDescription*" name="desc" />
</parameters>
</method>
<method name="SetFontMap" cname="pango_context_set_font_map">
<return-type type="void" />
<parameters>
<parameter type="PangoFontMap*" name="font_map" />
</parameters>
</method>
<method name="SetLanguage" cname="pango_context_set_language">
<return-type type="void" />
<parameters>
@ -253,25 +220,6 @@
<return-type type="GType" />
</method>
</object>
<object name="FontsetSimple" cname="PangoFontsetSimple" parent="PangoFontset">
<method name="Append" cname="pango_fontset_simple_append">
<return-type type="void" />
<parameters>
<parameter type="PangoFont*" name="font" />
</parameters>
</method>
<method name="GetType" cname="pango_fontset_simple_get_type" shared="true">
<return-type type="GType" />
</method>
<constructor cname="pango_fontset_simple_new">
<parameters>
<parameter type="PangoLanguage*" name="language" />
</parameters>
</constructor>
<method name="Size" cname="pango_fontset_simple_size">
<return-type type="int" />
</method>
</object>
<object name="FontFace" cname="PangoFontFace" parent="GObject">
<method name="Describe" cname="pango_font_face_describe">
<return-type type="PangoFontDescription*" />
@ -814,47 +762,8 @@
<return-type type="void" />
</method>
</struct>
<struct name="Engine" cname="PangoEngine">
<field cname="id" type="gchar*" />
<field cname="type" type="gchar*" />
<field cname="length" type="gint" />
</struct>
<struct name="EngineInfo" cname="PangoEngineInfo">
<field cname="id" type="gchar*" />
<field cname="engine_type" type="gchar*" />
<field cname="render_type" type="gchar*" />
<field cname="ranges" type="PangoEngineRange*" />
<field cname="n_ranges" type="gint" />
</struct>
<struct name="EngineLang" cname="PangoEngineLang">
<field cname="engine" type="PangoEngine" />
<callback cname="script_break">
<return-type type="void" />
<parameters>
<parameter type="const-char*" name="text,int" />
</parameters>
</callback>
</struct>
<struct name="EngineRange" cname="PangoEngineRange">
<field cname="start" type="guint32" />
<field cname="end" type="guint32" />
<field cname="langs" type="gchar*" />
</struct>
<struct name="EngineShape" cname="PangoEngineShape">
<field cname="engine" type="PangoEngine" />
<callback cname="script_shape">
<return-type type="void" />
<parameters>
<parameter type="PangoFont*" name="font,const-char*" />
</parameters>
</callback>
<callback cname="get_coverage">
<return-type type="PangoCoverage*" />
<parameters>
<parameter type="PangoFont*" name="font,PangoLanguage*" />
</parameters>
</callback>
</struct>
<struct name="EngineLang" cname="PangoEngineLang" opaque="true" />
<struct name="EngineShape" cname="PangoEngineShape" opaque="true" />
<boxed name="FontDescription" cname="PangoFontDescription" opaque="true">
<method name="BetterMatch" cname="pango_font_description_better_match">
<return-type type="gboolean" />
@ -981,12 +890,7 @@
</parameters>
</method>
</boxed>
<boxed name="FontMetrics" cname="PangoFontMetrics">
<field cname="ref_count" type="guint" />
<field cname="ascent" type="int" />
<field cname="descent" type="int" />
<field cname="approximate_char_width" type="int" />
<field cname="approximate_digit_width" type="int" />
<boxed name="FontMetrics" cname="PangoFontMetrics" opaque="true">
<method name="GetApproximateCharWidth" cname="pango_font_metrics_get_approximate_char_width">
<return-type type="int" />
</method>
@ -1002,7 +906,6 @@
<method name="GetType" cname="pango_font_metrics_get_type" shared="true">
<return-type type="GType" />
</method>
<constructor cname="pango_font_metrics_new" />
<method name="Ref" cname="pango_font_metrics_ref">
<return-type type="PangoFontMetrics*" />
</method>
@ -1114,59 +1017,6 @@
<struct name="GlyphVisAttr" cname="PangoGlyphVisAttr">
<field cname="is_cluster_start" bits="1" type="guint" />
</struct>
<struct name="IncludedModule" cname="PangoIncludedModule">
<callback cname="list">
<return-type type="void" />
<parameters>
<parameter type="PangoEngineInfo**" name="engines," />
</parameters>
</callback>
<callback cname="load">
<return-type type="PangoEngine*" />
<parameters>
<parameter type="const-char*" name="id" />
</parameters>
</callback>
<callback cname="unload">
<return-type type="void" />
<parameters>
<parameter type="PangoEngine*" name="engine" />
</parameters>
</callback>
</struct>
<struct name="IndicScript" cname="PangoIndicScript">
<field cname="name" type="gchar*" />
<callback cname="is_prefixing_vowel">
<return-type type="gboolean" />
<parameters>
<parameter type="gunichar" name="what" />
</parameters>
</callback>
<callback cname="is_vowel_sign">
<return-type type="gboolean" />
<parameters>
<parameter type="gunichar" name="what" />
</parameters>
</callback>
<callback cname="vowel_sign_to_matra">
<return-type type="gunichar" />
<parameters>
<parameter type="gunichar" name="what" />
</parameters>
</callback>
<callback cname="is_vowel_half">
<return-type type="gboolean" />
<parameters>
<parameter type="gunichar" name="what" />
</parameters>
</callback>
<callback cname="vowel_split">
<return-type type="gboolean" />
<parameters>
<parameter type="gunichar" name="what," />
</parameters>
</callback>
</struct>
<struct name="IntSet" cname="PangoIntSet">
<field cname="start" type="int" />
<field cname="size" type="int" />
@ -1375,106 +1225,6 @@
<field cname="is_sentence_start" bits="1" type="guint" />
<field cname="is_sentence_end" bits="1" type="guint" />
</struct>
<struct name="Map" cname="PangoMap" opaque="true">
<method name="GetEngine" cname="pango_map_get_engine">
<return-type type="PangoEngine*" />
<parameters>
<parameter type="guint32" name="wc" />
</parameters>
</method>
<method name="GetEntry" cname="pango_map_get_entry">
<return-type type="PangoMapEntry*" />
<parameters>
<parameter type="guint32" name="wc" />
</parameters>
</method>
</struct>
<struct name="MapEntry" cname="PangoMapEntry">
<field cname="info" type="PangoEngineInfo*" />
<field cname="is_exact" type="gboolean" />
</struct>
<struct name="OTInfo" cname="PangoOTInfo" opaque="true">
<method name="FindFeature" cname="pango_ot_info_find_feature">
<return-type type="gboolean" />
<parameters>
<parameter type="PangoOTTableType" name="table_type" />
<parameter type="PangoOTTag" name="feature_tag" />
<parameter type="guint" name="script_index" />
<parameter type="guint" name="language_index" />
<parameter type="guint*" name="feature_index" />
</parameters>
</method>
<method name="FindLanguage" cname="pango_ot_info_find_language">
<return-type type="gboolean" />
<parameters>
<parameter type="PangoOTTableType" name="table_type" />
<parameter type="guint" name="script_index" />
<parameter type="PangoOTTag" name="language_tag" />
<parameter type="guint*" name="language_index" />
<parameter type="guint*" name="required_feature_index" />
</parameters>
</method>
<method name="FindScript" cname="pango_ot_info_find_script">
<return-type type="gboolean" />
<parameters>
<parameter type="PangoOTTableType" name="table_type" />
<parameter type="PangoOTTag" name="script_tag" />
<parameter type="guint*" name="script_index" />
</parameters>
</method>
<method name="Get" cname="pango_ot_info_get" shared="true">
<return-type type="PangoOTInfo*" />
<parameters>
<parameter type="FT_Face" name="face" />
</parameters>
</method>
<method name="ListFeatures" cname="pango_ot_info_list_features">
<return-type type="PangoOTTag*" />
<parameters>
<parameter type="PangoOTTableType" name="table_type" />
<parameter type="PangoOTTag" name="tag" />
<parameter type="guint" name="script_index" />
<parameter type="guint" name="language_index" />
</parameters>
</method>
<method name="ListLanguages" cname="pango_ot_info_list_languages">
<return-type type="PangoOTTag*" />
<parameters>
<parameter type="PangoOTTableType" name="table_type" />
<parameter type="guint" name="script_index" />
<parameter type="PangoOTTag" name="language_tag" />
</parameters>
</method>
<method name="ListScripts" cname="pango_ot_info_list_scripts">
<return-type type="PangoOTTag*" />
<parameters>
<parameter type="PangoOTTableType" name="table_type" />
</parameters>
</method>
</struct>
<struct name="OTRuleset" cname="PangoOTRuleset" opaque="true">
<method name="AddFeature" cname="pango_ot_ruleset_add_feature">
<return-type type="void" />
<parameters>
<parameter type="PangoOTTableType" name="table_type" />
<parameter type="guint" name="feature_index" />
<parameter type="gulong" name="property_bit" />
</parameters>
</method>
<constructor cname="pango_ot_ruleset_new">
<parameters>
<parameter type="PangoOTInfo*" name="info" />
</parameters>
</constructor>
<method name="Shape" cname="pango_ot_ruleset_shape">
<return-type type="void" />
<parameters>
<parameter type="PangoGlyphString*" name="glyphs" />
<parameter type="gulong*" name="properties" />
</parameters>
</method>
</struct>
<alias name="OTTag" cname="PangoOTTag" type="guint32" />
<struct name="Rectangle" cname="PangoRectangle">
<field cname="x" type="int" />
<field cname="y" type="int" />
@ -1560,29 +1310,6 @@
</parameters>
</method>
</struct>
<struct name="XFontCache" cname="PangoXFontCache" opaque="true">
<method name="Free" cname="pango_x_font_cache_free">
<return-type type="void" />
</method>
<method name="Load" cname="pango_x_font_cache_load">
<return-type type="XFontStruct*" />
<parameters>
<parameter type="const-char*" name="xlfd" />
</parameters>
</method>
<constructor cname="pango_x_font_cache_new">
<parameters>
<parameter type="Display*" name="display" />
</parameters>
</constructor>
<method name="Unload" cname="pango_x_font_cache_unload">
<return-type type="void" />
<parameters>
<parameter type="XFontStruct*" name="fs" />
</parameters>
</method>
</struct>
<alias name="XSubfont" cname="PangoXSubfont" type="guint16" />
<class name="Attr" cname="PangoAttr_">
<method name="BackgroundNew" cname="pango_attr_background_new" shared="true">
<return-type type="PangoAttribute*" />
@ -1668,30 +1395,6 @@
</method>
</class>
<class name="Global" cname="PangoGlobal">
<method name="ConfigKeyGet" cname="pango_config_key_get" shared="true">
<return-type type="char*" />
<parameters>
<parameter type="const-char*" name="key" />
</parameters>
</method>
<method name="DefaultBreak" cname="pango_default_break" shared="true">
<return-type type="void" />
<parameters>
<parameter type="const-gchar*" name="text" />
<parameter type="int" name="length" />
<parameter type="PangoAnalysis*" name="analysis" />
<parameter type="PangoLogAttr*" name="attrs" />
<parameter type="int" name="attrs_len" />
</parameters>
</method>
<method name="FindMap" cname="pango_find_map" shared="true">
<return-type type="PangoMap*" />
<parameters>
<parameter type="PangoLanguage*" name="language" />
<parameter type="guint" name="engine_type_id" />
<parameter type="guint" name="render_type_id" />
</parameters>
</method>
<method name="FindParagraphBoundary" cname="pango_find_paragraph_boundary" shared="true">
<return-type type="void" />
<parameters>
@ -1701,9 +1404,6 @@
<parameter type="gint*" name="next_paragraph_start" />
</parameters>
</method>
<method name="GetLibSubdirectory" cname="pango_get_lib_subdirectory" shared="true">
<return-type type="const-char*" />
</method>
<method name="GetLogAttrs" cname="pango_get_log_attrs" shared="true">
<return-type type="void" />
<parameters>
@ -1722,23 +1422,6 @@
<parameter type="gunichar*" name="mirrored_ch" />
</parameters>
</method>
<method name="GetSysconfSubdirectory" cname="pango_get_sysconf_subdirectory" shared="true">
<return-type type="const-char*" />
</method>
<method name="LookupAliases" cname="pango_lookup_aliases" shared="true">
<return-type type="void" />
<parameters>
<parameter type="const-char*" name="fontname" />
<parameter type="char***" name="families" />
<parameter type="int*" name="n_families" />
</parameters>
</method>
<method name="ModuleRegister" cname="pango_module_register" shared="true">
<return-type type="void" />
<parameters>
<parameter type="PangoIncludedModule*" name="module" />
</parameters>
</method>
<method name="ParseMarkup" cname="pango_parse_markup" shared="true">
<return-type type="gboolean" />
<parameters>
@ -1836,296 +1519,5 @@
</parameters>
</method>
</class>
<class name="Indic" cname="PangoIndic_">
<method name="Compact" cname="pango_indic_compact" shared="true">
<return-type type="void" />
<parameters>
<parameter type="PangoIndicScript*" name="script" />
<parameter type="int*" name="num" />
<parameter type="gunichar*" name="chars" />
<parameter type="int*" name="cluster" />
</parameters>
</method>
<method name="ConvertVowels" cname="pango_indic_convert_vowels" shared="true">
<return-type type="void" />
<parameters>
<parameter type="PangoIndicScript*" name="script" />
<parameter type="gboolean" name="in_middle" />
<parameter type="int*" name="num" />
<parameter type="gunichar*" name="chars" />
<parameter type="gboolean" name="has_standalone_vowels" />
</parameters>
</method>
<method name="ShiftVowels" cname="pango_indic_shift_vowels" shared="true">
<return-type type="void" />
<parameters>
<parameter type="PangoIndicScript*" name="script" />
<parameter type="gunichar*" name="chars" />
<parameter type="gunichar*" name="end" />
</parameters>
</method>
<method name="SplitOutCharacters" cname="pango_indic_split_out_characters" shared="true">
<return-type type="void" />
<parameters>
<parameter type="PangoIndicScript*" name="script" />
<parameter type="const-gchar*" name="text" />
<parameter type="int" name="n_chars" />
<parameter type="gunichar**" name="wc" />
<parameter type="int*" name="n_glyph" />
<parameter type="PangoGlyphString*" name="glyphs" />
</parameters>
</method>
</class>
<class name="X" cname="PangoX_">
<method name="ApplyLigatures" cname="pango_x_apply_ligatures" shared="true">
<return-type type="gboolean" />
<parameters>
<parameter type="PangoFont*" name="font" />
<parameter type="PangoXSubfont" name="subfont" />
<parameter type="gunichar**" name="glyphs" />
<parameter type="int*" name="n_glyphs" />
<parameter type="int**" name="clusters" />
</parameters>
</method>
<method name="ContextSetFuncs" cname="pango_x_context_set_funcs" shared="true">
<return-type type="void" />
<parameters>
<parameter type="PangoContext*" name="context" />
<parameter type="PangoGetGCFunc" name="get_gc_func" />
<parameter type="PangoFreeGCFunc" name="free_gc_func" />
</parameters>
</method>
<method name="FallbackShape" cname="pango_x_fallback_shape" shared="true">
<return-type type="void" />
<parameters>
<parameter type="PangoFont*" name="font" />
<parameter type="PangoGlyphString*" name="glyphs" />
<parameter type="const-char*" name="text" />
<parameter type="int" name="n_chars" />
</parameters>
</method>
<method name="FindFirstSubfont" cname="pango_x_find_first_subfont" shared="true">
<return-type type="gboolean" />
<parameters>
<parameter type="PangoFont*" name="font" />
<parameter type="char**" name="charsets" />
<parameter type="int" name="n_charsets" />
<parameter type="PangoXSubfont*" name="rfont" />
</parameters>
</method>
<method name="FontGetUnknownGlyph" cname="pango_x_font_get_unknown_glyph" shared="true">
<return-type type="PangoGlyph" />
<parameters>
<parameter type="PangoFont*" name="font" />
<parameter type="gunichar" name="wc" />
</parameters>
</method>
<method name="FontMapForDisplay" cname="pango_x_font_map_for_display" shared="true">
<return-type type="PangoFontMap*" />
<parameters>
<parameter type="Display*" name="display" />
</parameters>
</method>
<method name="FontMapGetFontCache" cname="pango_x_font_map_get_font_cache" shared="true">
<return-type type="PangoXFontCache*" />
<parameters>
<parameter type="PangoFontMap*" name="font_map" />
</parameters>
</method>
<method name="FontSubfontXlfd" cname="pango_x_font_subfont_xlfd" shared="true">
<return-type type="char*" />
<parameters>
<parameter type="PangoFont*" name="font" />
<parameter type="PangoXSubfont" name="subfont_id" />
</parameters>
</method>
<method name="GetContext" cname="pango_x_get_context" shared="true">
<return-type type="PangoContext*" />
<parameters>
<parameter type="Display*" name="display" />
</parameters>
</method>
<method name="GetUnknownGlyph" cname="pango_x_get_unknown_glyph" shared="true">
<return-type type="PangoGlyph" />
<parameters>
<parameter type="PangoFont*" name="font" />
</parameters>
</method>
<method name="HasGlyph" cname="pango_x_has_glyph" shared="true">
<return-type type="gboolean" />
<parameters>
<parameter type="PangoFont*" name="font" />
<parameter type="PangoGlyph" name="glyph" />
</parameters>
</method>
<method name="ListSubfonts" cname="pango_x_list_subfonts" shared="true">
<return-type type="int" />
<parameters>
<parameter type="PangoFont*" name="font" />
<parameter type="char**" name="charsets" />
<parameter type="int" name="n_charsets" />
<parameter type="PangoXSubfont**" name="subfont_ids" />
<parameter type="int**" name="subfont_charsets" />
</parameters>
</method>
<method name="LoadFont" cname="pango_x_load_font" shared="true">
<return-type type="PangoFont*" />
<parameters>
<parameter type="Display*" name="display" />
<parameter type="const-gchar*" name="spec" />
</parameters>
</method>
<method name="Render" cname="pango_x_render" shared="true">
<return-type type="void" />
<parameters>
<parameter type="Display*" name="display" />
<parameter type="Drawable" name="d" />
<parameter type="GC" name="gc" />
<parameter type="PangoFont*" name="font" />
<parameter type="PangoGlyphString*" name="glyphs" />
<parameter type="gint" name="x" />
<parameter type="gint" name="y" />
</parameters>
</method>
<method name="RenderLayout" cname="pango_x_render_layout" shared="true">
<return-type type="void" />
<parameters>
<parameter type="Display*" name="display" />
<parameter type="Drawable" name="drawable" />
<parameter type="GC" name="gc" />
<parameter type="PangoLayout*" name="layout" />
<parameter type="int" name="x" />
<parameter type="int" name="y" />
</parameters>
</method>
<method name="RenderLayoutLine" cname="pango_x_render_layout_line" shared="true">
<return-type type="void" />
<parameters>
<parameter type="Display*" name="display" />
<parameter type="Drawable" name="drawable" />
<parameter type="GC" name="gc" />
<parameter type="PangoLayoutLine*" name="line" />
<parameter type="int" name="x" />
<parameter type="int" name="y" />
</parameters>
</method>
<method name="ShutdownDisplay" cname="pango_x_shutdown_display" shared="true">
<return-type type="void" />
<parameters>
<parameter type="Display*" name="display" />
</parameters>
</method>
</class>
<class name="Xft" cname="PangoXft_">
<method name="FontGetDisplay" cname="pango_xft_font_get_display" shared="true">
<return-type type="Display*" />
<parameters>
<parameter type="PangoFont*" name="font" />
</parameters>
</method>
<method name="FontGetFont" cname="pango_xft_font_get_font" shared="true">
<return-type type="XftFont*" />
<parameters>
<parameter type="PangoFont*" name="font" />
</parameters>
</method>
<method name="FontGetGlyph" cname="pango_xft_font_get_glyph" shared="true">
<return-type type="guint" />
<parameters>
<parameter type="PangoFont*" name="font" />
<parameter type="gunichar" name="wc" />
</parameters>
</method>
<method name="FontGetType" cname="pango_xft_font_get_type" shared="true">
<return-type type="GType" />
</method>
<method name="FontGetUnknownGlyph" cname="pango_xft_font_get_unknown_glyph" shared="true">
<return-type type="PangoGlyph" />
<parameters>
<parameter type="PangoFont*" name="font" />
<parameter type="gunichar" name="wc" />
</parameters>
</method>
<method name="FontHasChar" cname="pango_xft_font_has_char" shared="true">
<return-type type="gboolean" />
<parameters>
<parameter type="PangoFont*" name="font" />
<parameter type="gunichar" name="wc" />
</parameters>
</method>
<method name="FontLockFace" cname="pango_xft_font_lock_face" shared="true">
<return-type type="FT_Face" />
<parameters>
<parameter type="PangoFont*" name="font" />
</parameters>
</method>
<method name="FontUnlockFace" cname="pango_xft_font_unlock_face" shared="true">
<return-type type="void" />
<parameters>
<parameter type="PangoFont*" name="font" />
</parameters>
</method>
<method name="GetContext" cname="pango_xft_get_context" shared="true">
<return-type type="PangoContext*" />
<parameters>
<parameter type="Display*" name="display" />
<parameter type="int" name="screen" />
</parameters>
</method>
<method name="GetFontMap" cname="pango_xft_get_font_map" shared="true">
<return-type type="PangoFontMap*" />
<parameters>
<parameter type="Display*" name="display" />
<parameter type="int" name="screen" />
</parameters>
</method>
<method name="PictureRender" cname="pango_xft_picture_render" shared="true">
<return-type type="void" />
<parameters>
<parameter type="Display*" name="display" />
<parameter type="Picture" name="src_picture" />
<parameter type="Picture" name="dest_picture" />
<parameter type="PangoFont*" name="font" />
<parameter type="PangoGlyphString*" name="glyphs" />
<parameter type="gint" name="x" />
<parameter type="gint" name="y" />
</parameters>
</method>
<method name="Render" cname="pango_xft_render" shared="true">
<return-type type="void" />
<parameters>
<parameter type="XftDraw*" name="draw" />
<parameter type="XftColor*" name="color" />
<parameter type="PangoFont*" name="font" />
<parameter type="PangoGlyphString*" name="glyphs" />
<parameter type="gint" name="x" />
<parameter type="gint" name="y" />
</parameters>
</method>
<method name="SetDefaultSubstitute" cname="pango_xft_set_default_substitute" shared="true">
<return-type type="void" />
<parameters>
<parameter type="Display*" name="display" />
<parameter type="int" name="screen" />
<parameter type="PangoXftSubstituteFunc" name="func" />
<parameter type="gpointer" name="data" />
<parameter type="GDestroyNotify" name="notify" />
</parameters>
</method>
<method name="ShutdownDisplay" cname="pango_xft_shutdown_display" shared="true">
<return-type type="void" />
<parameters>
<parameter type="Display*" name="display" />
<parameter type="int" name="screen" />
</parameters>
</method>
<method name="SubstituteChanged" cname="pango_xft_substitute_changed" shared="true">
<return-type type="void" />
<parameters>
<parameter type="Display*" name="display" />
<parameter type="int" name="screen" />
</parameters>
</method>
</class>
</namespace>
</api>

18
parser/gapi_pp.pl
View File

@ -10,6 +10,7 @@
# <c> 2003 Martin Willemoes Hansen
# <c> 2003 Novell, Inc.
$private_regex = "^#if.*(ENABLE_BACKEND|ENABLE_ENGINE)";
$eatit_regex = "^#if.*(__cplusplus|DEBUG|DISABLE_(DEPRECATED|COMPAT)|ENABLE_BROKEN|COMPILATION)";
$ignoreit_regex = '^\s+\*|#ident|#\s*include|#\s*else|#\s*endif|#\s*undef|G_(BEGIN|END)_DECLS|extern|GDKVAR|GTKVAR|GTKMAIN_C_VAR|GTKTYPEUTILS_VAR|VARIABLE|GTKTYPEBUILTIN';
@ -64,6 +65,23 @@ foreach $fname (@hdrs) {
while ($line !~ /\*\//) {$line = <INFILE>;}
} elsif ($line =~ /^#ifndef\s+\w+_H_*\b/) {
while ($line !~ /#define/) {$line = <INFILE>;}
} elsif ($line =~ /$private_regex/) {
$nested = 0;
while ($line = <INFILE>) {
last if (!$nested && ($line =~ /#else|#endif/));
if ($line =~ /#if/) {
$nested++;
} elsif ($line =~ /#endif/) {
$nested--
}
next if ($line !~ /^struct/);
print "private$line";
do {
$line = <INFILE>;
print $line;
} until ($line =~ /^\}/);
}
} elsif ($line =~ /$eatit_regex/) {
$nested = 0;
while ($line = <INFILE>) {

14
sample/CanvasExample.cs
View File

@ -102,14 +102,14 @@ namespace GtkSamples {
EventButton ev = EventButton.New (args.Event.Handle);
CanvasRE item = (CanvasRE) obj;
switch (ev.type) {
switch (ev.Type) {
case EventType.ButtonPress:
if (ev.button == 1) {
remember_x = ev.x;
remember_y = ev.y;
if (ev.Button == 1) {
remember_x = ev.X;
remember_y = ev.Y;
args.RetVal = true;
return;
} else if (ev.button == 3) {
} else if (ev.Button == 3) {
item.Destroy ();
args.RetVal = true;
return;
@ -120,9 +120,9 @@ namespace GtkSamples {
args.RetVal = true;
return;
case EventType.MotionNotify:
Gdk.ModifierType state = (Gdk.ModifierType) ev.state;
Gdk.ModifierType state = (Gdk.ModifierType) ev.State;
if ((state & Gdk.ModifierType.Button1Mask) != 0) {
double new_x = ev.x, new_y = ev.y;
double new_x = ev.X, new_y = ev.Y;
item.Move (new_x - remember_x, new_y - remember_y);
remember_x = new_x;
remember_y = new_y;

2
sample/GnomeHelloWorld.cs
View File

@ -160,7 +160,7 @@ namespace GtkSamples {
if (type != Gdk.WindowType.Child)
Console.WriteLine ("Struct field accessors appear to be broken.");
if (ev.type == EventType.TwoButtonPress && ev.button == 1) {
if (ev.Type == EventType.TwoButtonPress && ev.Button == 1) {
g_spawn_command_line_async ("mono " + entries[idx].program, IntPtr.Zero);
}
}

6
sample/GtkDemo/DemoColorSelection.cs
View File

@ -71,12 +71,12 @@ namespace GtkDemo
{
EventExpose eventExpose = args.Event;
Gdk.Window window = eventExpose.window;
Rectangle area = eventExpose.area;
Rectangle area = eventExpose.Area;
window.DrawRectangle (drawingArea.Style.BackgroundGC(StateType.Normal),
true,
area.x, area.y,
area.width, area.height);
area.X, area.Y,
area.Width, area.Height);
SignalArgs sa = (SignalArgs) args;
sa.RetVal = true;
}

58
sample/GtkDemo/DemoDrawingArea.cs
View File

@ -114,25 +114,25 @@ namespace GtkDemo {
Gdk.Window window = eventExpose.window;
gc1 = new Gdk.GC (window);
color.red = 30000;
color.green = 0;
color.blue = 30000;
color.Red = 30000;
color.Green = 0;
color.Blue = 30000;
gc1.RgbFgColor = color;
gc2 = new Gdk.GC (window);
color.red = 65535;
color.green = 65535;
color.blue = 65535;
color.Red = 65535;
color.Green = 65535;
color.Blue = 65535;
gc2.RgbFgColor = color;
// Start redrawing the Checkerboard
xcount = 0;
i = Spacing;
while (i < drawingArea.Allocation.width){
while (i < drawingArea.Allocation.Width){
j = Spacing;
ycount = xcount % 2; //start with even/odd depending on row
while (j < drawingArea.Allocation.height){
while (j < drawingArea.Allocation.Height){
gc = new Gdk.GC (window);
if (ycount % 2 != 0){
gc = gc1;}
@ -161,13 +161,13 @@ namespace GtkDemo {
EventExpose eventExpose = args.Event;
Gdk.Window window = eventExpose.window;
Rectangle area = eventExpose.area;
Rectangle area = eventExpose.Area;
window.DrawDrawable (drawingArea1.Style.ForegroundGC(StateType.Normal),
pixmap,
area.x, area.y,
area.x, area.y,
area.width, area.height);
area.X, area.Y,
area.X, area.Y,
area.Width, area.Height);
SignalArgs sa = (SignalArgs) args;
sa.RetVal = false;
}
@ -179,12 +179,12 @@ namespace GtkDemo {
Gdk.Window window = eventConfigure.window;
Rectangle allocation = drawingArea1.Allocation;
pixmap = new Pixmap (window,
allocation.width,
allocation.height,
allocation.Width,
allocation.Height,
-1);
// Initialize the pixmap to white
pixmap.DrawRectangle (drawingArea1.Style.WhiteGC, true, 0, 0,
allocation.width, allocation.height);
allocation.Width, allocation.Height);
SignalArgs sa = (SignalArgs) args;
// We've handled the configure event, no need for further processing.
sa.RetVal = true;
@ -208,14 +208,14 @@ namespace GtkDemo {
EventMotion ev = args.Event;
Gdk.Window window = ev.window;
if (ev.is_hint != 0) {
if (ev.IsHint != 0) {
ModifierType s;
window.GetPointer (out x, out y, out s);
state = s;
} else {
x = (int) ev.x;
y = (int) ev.y;
state = (ModifierType) ev.state;
x = (int) ev.X;
y = (int) ev.Y;
state = (ModifierType) ev.State;
}
if ((state & ModifierType.Button1Mask) != 0 && pixmap != null)
@ -230,24 +230,24 @@ namespace GtkDemo {
static void DrawBrush (double x, double y)
{
Rectangle update_rect = new Rectangle ();
update_rect.x = (int) x - 3;
update_rect.y = (int) y - 3;
update_rect.width = 6;
update_rect.height = 6;
update_rect.X = (int) x - 3;
update_rect.Y = (int) y - 3;
update_rect.Width = 6;
update_rect.Height = 6;
//Paint to the pixmap, where we store our state
pixmap.DrawRectangle (drawingArea1.Style.BlackGC, true,
update_rect.x, update_rect.y,
update_rect.width, update_rect.height);
drawingArea1.QueueDrawArea (update_rect.x, update_rect.y,
update_rect.width, update_rect.height);
update_rect.X, update_rect.Y,
update_rect.Width, update_rect.Height);
drawingArea1.QueueDrawArea (update_rect.X, update_rect.Y,
update_rect.Width, update_rect.Height);
}
private void ScribbleButtonPress (object o, ButtonPressEventArgs args)
{
EventButton ev = args.Event;
if (ev.button == 1 && pixmap != null)
DrawBrush (ev.x, ev.y);
if (ev.Button == 1 && pixmap != null)
DrawBrush (ev.X, ev.Y);
//We've handled the event, stop processing
SignalArgs sa = (SignalArgs) args;
sa.RetVal = true;

16
sample/GtkDemo/DemoMenus.cs
View File

@ -95,21 +95,21 @@ namespace GtkDemo
menuitem = new CheckMenuItem ("Accelerate Me");
menu.Append (menuitem);
AccelKey ak = new AccelKey ();
ak.accel_key = 0xFFBE;
menuitem.AddAccelerator ("activate", accel_group, ak, 0, AccelFlags.Visible);
ak.Key = (Gdk.Key) 0xFFBE;
menuitem.AddAccelerator ("activate", accel_group, ak);
menuitem = new CheckMenuItem ("Accelerator locked");
menu.Append (menuitem);
AccelKey ak2 = new AccelKey ();
ak2.accel_key = 0xFFBF;
menuitem.AddAccelerator ("activate", accel_group, ak2, 0, AccelFlags.Visible | AccelFlags.Locked);
ak2.Key = (Gdk.Key) 0xFFBF;
menuitem.AddAccelerator ("activate", accel_group, ak2);
menuitem = new CheckMenuItem ("Accelerator Frozen");
menu.Append (menuitem);
AccelKey ak3 = new AccelKey ();
ak3.accel_key = 0xFFC0;
menuitem.AddAccelerator ("activate", accel_group, ak2, 0, AccelFlags.Visible);
menuitem.AddAccelerator ("activate", accel_group, ak3, 0, AccelFlags.Visible);
ak3.Key = (Gdk.Key) 0xFFC0;
menuitem.AddAccelerator ("activate", accel_group, ak2);
menuitem.AddAccelerator ("activate", accel_group, ak3);
OptionMenu option_menu = new OptionMenu ();
option_menu.Menu = menu;
@ -152,7 +152,7 @@ namespace GtkDemo
for (int i = 0, j = 1; i < 5; i++, j++)
{
label = String.Format ("item {0} - {1}", depth, j);
menuitem = RadioMenuItem.NewWithLabel (group, label);
menuitem = new RadioMenuItem (group, label);
group = ((RadioMenuItem) menuitem).Group;
menuitem = new MenuItem (label);
menu.Append (menuitem);

6
sample/GtkDemo/DemoPixbuf.cs
View File

@ -89,7 +89,7 @@ namespace GtkDemo
EventExpose ev = args.Event;
Widget widget = (Widget) o;
Gdk.Rectangle area = ev.area;
Gdk.Rectangle area = ev.Area;
frame.RenderToDrawableAlpha(
widget.GdkWindow,
@ -156,8 +156,8 @@ namespace GtkDemo
: Math.Max (127, Math.Abs (255 * Math.Cos (f *
2 * Math.PI)))));
*/
images[i].Composite (frame, r1.x, r1.y, r1.width,
r1.height, xpos, ypos, k, k,
images[i].Composite (frame, r1.X, r1.Y, r1.Width,
r1.Height, xpos, ypos, k, k,
InterpType.Nearest, (int) ((i % 2 == 1)
? Math.Max (127, Math.Abs (255 * Math.Sin (f *
2 * Math.PI)))

2
sample/GtkDemo/Makefile
View File

@ -1,7 +1,7 @@
CSC = mcs
DLLS = /r:gtk-sharp.dll /r:glib-sharp.dll /r:pango-sharp.dll /r:gdk-sharp.dll /r:System.Drawing.dll
DLLS = /r:gtk-sharp /r:glib-sharp /r:pango-sharp /r:gdk-sharp /r:System.Drawing
all: *.cs
$(CSC) -g /out:GtkDemo.exe *.cs $(DLLS)

42
sample/Scribble.cs
View File

@ -51,13 +51,13 @@ namespace GtkSamples {
Gdk.EventExpose ev = args.Event;
Gdk.Window window = ev.window;
// FIXME: mcs bug
Gdk.Rectangle area = ev.area;
Gdk.Rectangle area = ev.Area;
// FIXME: array marshalling not done yet so no FG */
window.DrawDrawable (darea.Style.BlackGC,
pixmap,
area.x, area.y,
area.x, area.y,
area.width, area.height);
area.X, area.Y,
area.X, area.Y,
area.Width, area.Height);
args.RetVal = false;
}
@ -70,12 +70,12 @@ namespace GtkSamples {
Console.WriteLine ("Darea=[{0}]" , darea);
pixmap = new Gdk.Pixmap (window,
allocation.width,
allocation.height,
allocation.Width,
allocation.Height,
-1);
Console.WriteLine ("Darea.Style={0}", darea.Style);
pixmap.DrawRectangle (darea.Style.WhiteGC, true, 0, 0,
allocation.width, allocation.height);
allocation.Width, allocation.Height);
args.RetVal = true;
}
@ -83,23 +83,23 @@ namespace GtkSamples {
static void DrawBrush (double x, double y)
{
Gdk.Rectangle update_rect = new Gdk.Rectangle ();
update_rect.x = (int) x - 5;
update_rect.y = (int) y - 5;
update_rect.width = 10;
update_rect.height = 10;
update_rect.X = (int) x - 5;
update_rect.Y = (int) y - 5;
update_rect.Width = 10;
update_rect.Height = 10;
pixmap.DrawRectangle (darea.Style.BlackGC, true,
update_rect.x, update_rect.y,
update_rect.width, update_rect.height);
darea.QueueDrawArea (update_rect.x, update_rect.y,
update_rect.width, update_rect.height);
update_rect.X, update_rect.Y,
update_rect.Width, update_rect.Height);
darea.QueueDrawArea (update_rect.X, update_rect.Y,
update_rect.Width, update_rect.Height);
}
static void ButtonPressEvent (object obj, ButtonPressEventArgs args)
{
Gdk.EventButton ev = args.Event;
if (ev.button == 1 && pixmap != null)
DrawBrush (ev.x, ev.y);
if (ev.Button == 1 && pixmap != null)
DrawBrush (ev.X, ev.Y);
args.RetVal = true;
}
@ -111,14 +111,14 @@ namespace GtkSamples {
Gdk.EventMotion ev = args.Event;
Gdk.Window window = ev.window;
if (ev.is_hint != 0) {
if (ev.IsHint != 0) {
Gdk.ModifierType s;
window.GetPointer (out x, out y, out s);
state = s;
} else {
x = (int) ev.x;
y = (int) ev.y;
state = (Gdk.ModifierType) ev.state;
x = (int) ev.X;
y = (int) ev.Y;
state = (Gdk.ModifierType) ev.State;
}
if ((state & Gdk.ModifierType.Button1Mask) != 0 && pixmap != null)

2
sample/test/TestCheckButton.cs
View File

@ -50,7 +50,7 @@ namespace WidgetViewer {
box2.BorderWidth = 10;
box1.PackStart (box2, false, false, 0);
Button button = Button.NewFromStock (Stock.Close);
Button button = new Button (Stock.Close);
button.Clicked += new EventHandler (OnCloseClicked);
button.CanDefault = true;

15
sample/test/TestColorSelection.cs
View File

@ -63,7 +63,7 @@ namespace WidgetViewer {
static string HexFormat (Gdk.Color color)
{
StringBuilder s = new StringBuilder ();
ushort[] vals = { color.red, color.green, color.blue };
ushort[] vals = { color.Red, color.Green, color.Blue };
char[] hexchars = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
'A', 'B', 'C', 'D', 'E', 'F'};
@ -88,12 +88,8 @@ namespace WidgetViewer {
static void Color_Selection_OK (object o, EventArgs args)
{
Gdk.Color selected = window.ColorSelection.CurrentColor;
if (selected == Gdk.Color.Zero)
Console.WriteLine ("Color selection failed.");
else {
window.Hide ();
Display_Result (selected);
}
window.Hide ();
Display_Result (selected);
}
static void Color_Selection_Cancel (object o, EventArgs args)
@ -109,9 +105,6 @@ namespace WidgetViewer {
static void Display_Result (Gdk.Color color)
{
if (color == Gdk.Color.Zero)
Console.WriteLine ("Null color");
dialog = new Dialog ();
dialog.Title = "Selected Color: " + HexFormat (color);
dialog.HasSeparator = true;
@ -124,7 +117,7 @@ namespace WidgetViewer {
dialog.VBox.PackStart (da, true, true, 10);
dialog.SetDefaultSize (200, 200);
Button button = Button.NewFromStock (Stock.Ok);
Button button = new Button (Stock.Ok);
button.Clicked += new EventHandler (Dialog_Ok);
button.CanDefault = true;
dialog.ActionArea.PackStart (button, true, true, 0);

2
sample/test/TestCombo.cs
View File

@ -42,7 +42,7 @@ namespace WidgetViewer {
box2.BorderWidth = 10;
box1.PackStart (box2, false, false, 0);
Button button = Button.NewFromStock (Stock.Close);
Button button = new Button (Stock.Close);
button.Clicked += new EventHandler (OnCloseClicked);
button.CanDefault = true;

2
sample/test/TestDialog.cs
View File

@ -25,7 +25,7 @@ namespace WidgetViewer {
window.SetDefaultSize (200, 100);
window.Title = "GtkDialog";
Button button = Button.NewFromStock (Stock.Ok);
Button button = new Button (Stock.Ok);
button.Clicked += new EventHandler (Close_Button);
button.CanDefault = true;
window.ActionArea.PackStart (button, true, true, 0);

2
sample/test/TestFlipping.cs
View File

@ -39,7 +39,7 @@ namespace WidgetViewer {
check_button.Toggled += new EventHandler (Toggle_Flip);
check_button.BorderWidth = 10;
button = Button.NewFromStock (Stock.Close);
button = new Button (Stock.Close);
button.Clicked += new EventHandler (Close_Button);
button.CanDefault = true;

4
sample/test/TestMenus.cs
View File

@ -88,7 +88,7 @@ namespace WidgetViewer {
box2.BorderWidth = 10;
box1.PackStart (box2, false, true, 0);
Button close_button = Button.NewFromStock (Stock.Close);
Button close_button = new Button (Stock.Close);
close_button.Clicked += new EventHandler (Close_Button);
box2.PackStart (close_button, true, true, 0);
@ -118,7 +118,7 @@ namespace WidgetViewer {
for (int i = 0, j = 1; i < 5; i++, j++) {
label = String.Format ("item {0} - {1}", depth, j);
menuitem = RadioMenuItem.NewWithLabel (group, label);
menuitem = new RadioMenuItem (group, label);
group = ((RadioMenuItem) menuitem).Group;
menuitem = new MenuItem (label);
menu.Append (menuitem);

16
sample/test/TestRadioButton.cs
View File

@ -29,17 +29,17 @@ namespace WidgetViewer {
box2.BorderWidth = 10;
box1.PackStart (box2, true, true, 0);
radio_button = RadioButton.NewWithLabel (new GLib.SList (IntPtr.Zero), "Button 1");
radio_button = new RadioButton ("Button 1");
box2.PackStart (radio_button, true, true, 0);
radio_button = RadioButton.NewWithLabelFromWidget (radio_button, "Button 2");
radio_button = new RadioButton (radio_button, "Button 2");
radio_button.Active = true;
box2.PackStart (radio_button, true, true, 0);
radio_button = RadioButton.NewWithLabelFromWidget (radio_button, "Button 3");
radio_button = new RadioButton (radio_button, "Button 3");
box2.PackStart (radio_button, true, true, 0);
radio_button = RadioButton.NewWithLabelFromWidget (radio_button, "Inconsistent");
radio_button = new RadioButton (radio_button, "Inconsistent");
radio_button.Inconsistent = true;
box2.PackStart (radio_button, true, true, 0);
@ -49,16 +49,16 @@ namespace WidgetViewer {
box2.BorderWidth = 10;
box1.PackStart (box2, true, true, 0);
radio_button = RadioButton.NewWithLabel (new GLib.SList (IntPtr.Zero), "Button 4");
radio_button = new RadioButton ("Button 4");
radio_button.Mode = false;
box2.PackStart (radio_button, true, true, 0);
radio_button = RadioButton.NewWithLabelFromWidget (radio_button, "Button 5");
radio_button = new RadioButton (radio_button, "Button 5");
radio_button.Active = true;
radio_button.Mode = false;
box2.PackStart (radio_button, true, true, 0);
radio_button = RadioButton.NewWithLabelFromWidget (radio_button, "Button 6");
radio_button = new RadioButton (radio_button, "Button 6");
radio_button.Mode = false;
box2.PackStart (radio_button, true, true, 0);
@ -68,7 +68,7 @@ namespace WidgetViewer {
box2.BorderWidth = 10;
box1.PackStart (box2, false, true, 0);
Button button = Button.NewFromStock (Stock.Close);
Button button = new Button (Stock.Close);
button.Clicked += new EventHandler (Close_Button);
box2.PackStart (button, true, true, 0);
button.CanDefault = true;

2
sample/test/TestRange.cs
View File

@ -76,7 +76,7 @@ namespace WidgetViewer {
box2.BorderWidth = 10;
box1.PackStart (box2, false, true, 0);
Button button = Button.NewFromStock (Stock.Close);
Button button = new Button (Stock.Close);
button.Clicked += new EventHandler (Close_Button);
box2.PackStart (button, true, true, 0);
button.CanDefault = true;

6
sample/test/TestSizeGroup.cs
View File

@ -51,7 +51,7 @@ namespace WidgetViewer {
table = new Table (2, 2, false);
table.BorderWidth = 5;
table.RowSpacing = 5;
table.ColSpacings = 10;
table.ColumnSpacing = 10;
frame.Add (table);
Add_Row (table, 0, size_group, "_Dashing", dashes);
@ -62,7 +62,7 @@ namespace WidgetViewer {
check_button.Active = true;
check_button.Toggled += new EventHandler (Button_Toggle_Cb);
Button close_button = Button.NewFromStock (Stock.Close);
Button close_button = new Button (Stock.Close);
close_button.Clicked += new EventHandler (Close_Button);
window.ActionArea.PackStart (close_button, false, false, 0);
@ -91,7 +91,7 @@ namespace WidgetViewer {
static void Add_Row (Table table, uint row, SizeGroup size_group,
string label_text, string [] options)
{
Label label = Label.NewWithMnemonic (label_text);
Label label = new Label (label_text);
label.SetAlignment (0, 1);
table.Attach (label,

2
sample/test/TestStatusbar.cs
View File

@ -50,7 +50,7 @@ namespace WidgetViewer {
box2.BorderWidth = 10;
box1.PackStart (box2, false, true, 0);
Button close_button = Button.NewFromStock (Stock.Close);
Button close_button = new Button (Stock.Close);
close_button.Clicked += new EventHandler (Close_Button);
box2.PackStart (close_button, true, true, 0);
button.CanDefault = true;

2
sample/test/WidgetViewer.cs
View File

@ -57,7 +57,7 @@ namespace WidgetViewer {
box2.BorderWidth = 10;
box1.PackStart (box2, false, false, 0);
Button close_button = Button.NewFromStock (Stock.Close);
Button close_button = new Button (Stock.Close);
close_button.Clicked += new EventHandler (Close_Button);
box2.PackStart (close_button, true, true, 0);

9
sources/gtk-sharp-sources.xml
View File

@ -10,6 +10,15 @@
<library name="libpango-1.0-0.dll">
<namespace name="Pango">
<dir>pango-1.2.3/pango</dir>
<exclude>pango-1.2.3/pango/pangox-fontcache.c</exclude>
<exclude>pango-1.2.3/pango/pangox-fontmap.c</exclude>
<exclude>pango-1.2.3/pango/pangox-private.h</exclude>
<exclude>pango-1.2.3/pango/pangox.h</exclude>
<exclude>pango-1.2.3/pango/pangox.c</exclude>
<exclude>pango-1.2.3/pango/pangoxft.h</exclude>
<exclude>pango-1.2.3/pango/pangoxft-font.h</exclude>
<exclude>pango-1.2.3/pango/pangoxft-fontmap.h</exclude>
<exclude>pango-1.2.3/pango/pangoxft-private.h</exclude>
</namespace>
</library>
</api>