ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2002-07-13 Rachel Hestilow <hestilow@ximian.com>

Browse source 
* parser/Gnome.metadata, Gtk.metadata: More conflict
	fixes.
	* parser/build.pl: Fully qualify all lib names. (Gtk+ packages
	are now LFS-compliant in Debian...)
	* parser/gapi2xml.pl: Fix for whitespace in fields, defines,
	and docs.

	* generator/BoxedGen.cs: Remove extraneous CallByName definition,
	add "override" keyword to FromNative.
	(Generate): Generate methods after fields.
	* generator/ClassBase.cs: Change CallByName, FromNative to virtual.
	(.ctor): Ignore "hidden" nodes. Set container on signal.
	(GenSignals, GenMethods): Add "implementor" argument for interface
	use.
	(Get(Method|Signal|Property)Recursively): Rework to correctly
	recurse interfaces.
	(Implements): Added.
	* generator/Ctor.cs (Initialize): Move clash initialization completely
	out of Generate, so we can check for collisions.
	* generator/Method.cs (GenerateDeclCommon): Check for duplicates,
	for "new" keyword.
	(Generate): Add "implementor" argument.
	* generator/ObjectGen.cs (Generate): Initialize ctor clashes on
	this and all parents, before generating.
	(Ctors, InitializeCtors): Added.
	* generator/Signal.cs: Store the container_type, check for
	collisions.
	* generator/StructGen.cs: Add "override" keyword to overriden methods.

	* gtk/FileSelection.custom (ActionArea): Add "new" keyword.

svn path=/trunk/gtk-sharp/; revision=5782
This commit is contained in:
Rachel Hestilow 2002-07-13 20:31:23 +00:00
parent 69da00a945
commit fb1256d2f3
16 changed files with 505 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ChangeLog
View file

@ -1,3 +1,36 @@
2002-07-13 Rachel Hestilow <hestilow@ximian.com>
* parser/Gnome.metadata, Gtk.metadata: More conflict
fixes.
* parser/build.pl: Fully qualify all lib names. (Gtk+ packages
are now LFS-compliant in Debian...)
* parser/gapi2xml.pl: Fix for whitespace in fields, defines,
and docs.
* generator/BoxedGen.cs: Remove extraneous CallByName definition,
add "override" keyword to FromNative.
(Generate): Generate methods after fields.
* generator/ClassBase.cs: Change CallByName, FromNative to virtual.
(.ctor): Ignore "hidden" nodes. Set container on signal.
(GenSignals, GenMethods): Add "implementor" argument for interface
use.
(Get(Method|Signal|Property)Recursively): Rework to correctly
recurse interfaces.
(Implements): Added.
* generator/Ctor.cs (Initialize): Move clash initialization completely
out of Generate, so we can check for collisions.
* generator/Method.cs (GenerateDeclCommon): Check for duplicates,
for "new" keyword.
(Generate): Add "implementor" argument.
* generator/ObjectGen.cs (Generate): Initialize ctor clashes on
this and all parents, before generating.
(Ctors, InitializeCtors): Added.
* generator/Signal.cs: Store the container_type, check for
collisions.
* generator/StructGen.cs: Add "override" keyword to overriden methods.
* gtk/FileSelection.custom (ActionArea): Add "new" keyword.
2002-07-11 Mike Kestner <mkestner@speakeasy.net> 2002-07-11 Mike Kestner <mkestner@speakeasy.net>
* glib/SList.cs : fix a couple DllImports * glib/SList.cs : fix a couple DllImports

12
generator/BoxedGen.cs
View file

@ -15,12 +15,7 @@ namespace GtkSharp.Generation {
public BoxedGen (XmlElement ns, XmlElement elem) : base (ns, elem) {} public BoxedGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
public String CallByName (String var_name) public override String FromNative(String var)
{
return var_name + ".Handle";
}
public String FromNative(String var)
{ {
return "(" + QualifiedName + ") GLib.Boxed.FromNative(" + var + ")"; return "(" + QualifiedName + ") GLib.Boxed.FromNative(" + var + ")";
} }
@ -68,9 +63,7 @@ namespace GtkSharp.Generation {
break; break;
case "method": case "method":
if (!GenMethod(member, sw)) { //Console.WriteLine ("HIYA {0}", ((Method) member).Name);
Console.WriteLine(" in boxed " + CName);
}
break; break;
default: default:
@ -79,6 +72,7 @@ namespace GtkSharp.Generation {
} }
} }
GenMethods (sw, null, null, false);
AppendCustom(sw); AppendCustom(sw);
sw.WriteLine ("\t}"); sw.WriteLine ("\t}");
CloseWriter (sw); CloseWriter (sw);

80
generator/ClassBase.cs
View file

@ -41,6 +41,8 @@ namespace GtkSharp.Generation {
foreach (XmlNode node in elem.ChildNodes) { foreach (XmlNode node in elem.ChildNodes) {
if (!(node is XmlElement)) continue; if (!(node is XmlElement)) continue;
XmlElement member = (XmlElement) node; XmlElement member = (XmlElement) node;
if (member.HasAttribute ("hidden"))
continue;
switch (node.Name) { switch (node.Name) {
case "method": case "method":
@ -55,7 +57,7 @@ namespace GtkSharp.Generation {
break; break;
case "signal": case "signal":
sigs.Add (member.GetAttribute ("name"), new Signal (member)); sigs.Add (member.GetAttribute ("name"), new Signal (member, this));
break; break;
case "implements": case "implements":
@ -89,12 +91,12 @@ namespace GtkSharp.Generation {
} }
} }
public String CallByName (String var_name) public virtual String CallByName (String var_name)
{ {
return var_name + ".Handle"; return var_name + ".Handle";
} }
public String FromNative(String var) public virtual String FromNative(String var)
{ {
return "(" + QualifiedName + ") GLib.Object.GetObject(" + var + ")"; return "(" + QualifiedName + ") GLib.Object.GetObject(" + var + ")";
} }
@ -112,14 +114,14 @@ namespace GtkSharp.Generation {
} }
} }
public void GenSignals (StreamWriter sw, bool gen_docs) public void GenSignals (StreamWriter sw, ClassBase implementor, bool gen_docs)
{ {
if (sigs == null) if (sigs == null)
return; return;
foreach (Signal sig in sigs.Values) { foreach (Signal sig in sigs.Values) {
if (sig.Validate ()) if (sig.Validate ())
sig.Generate (sw, gen_docs); sig.Generate (sw, implementor, gen_docs);
else else
Console.WriteLine(" in Object " + Name); Console.WriteLine(" in Object " + Name);
} }
@ -146,7 +148,7 @@ namespace GtkSharp.Generation {
(props != null) && props.ContainsKey(mname.Substring(3))); (props != null) && props.ContainsKey(mname.Substring(3)));
} }
public void GenMethods (StreamWriter sw, Hashtable collisions, bool gen_docs) public void GenMethods (StreamWriter sw, Hashtable collisions, ClassBase implementor, bool gen_docs)
{ {
if (methods == null) if (methods == null)
return; return;
@ -165,7 +167,7 @@ namespace GtkSharp.Generation {
method.Name = Name + "." + method.Name; method.Name = Name + "." + method.Name;
method.Protection = ""; method.Protection = "";
} }
method.Generate (sw, gen_docs); method.Generate (sw, implementor, gen_docs);
if (oname != null) if (oname != null)
{ {
method.Name = oname; method.Name = oname;
@ -187,16 +189,34 @@ namespace GtkSharp.Generation {
return (Property) props[name]; return (Property) props[name];
} }
public virtual Method GetMethodRecursively (string name) public Signal GetSignal (string name)
{ {
ClassBase klass = this; return (Signal) sigs[name];
Method m = null; }
while (klass != null && m == null) {
m = (Method) klass.GetMethod (name); public Method GetMethodRecursively (string name)
klass = klass.Parent; {
return GetMethodRecursively (name, false);
}
public virtual Method GetMethodRecursively (string name, bool check_self)
{
Method p = null;
if (check_self)
p = GetMethod (name);
if (p == null && Parent != null)
p = Parent.GetMethodRecursively (name, true);
if (check_self && p == null && interfaces != null) {
foreach (string iface in interfaces) {
ClassBase igen = SymbolTable.GetClassGen (iface);
p = igen.GetMethodRecursively (name, true);
if (p != null)
break;
}
} }
return m; return p;
} }
public virtual Property GetPropertyRecursively (string name) public virtual Property GetPropertyRecursively (string name)
@ -211,5 +231,37 @@ namespace GtkSharp.Generation {
return p; return p;
} }
public Signal GetSignalRecursively (string name)
{
return GetSignalRecursively (name, false);
}
public virtual Signal GetSignalRecursively (string name, bool check_self)
{
Signal p = null;
if (check_self)
p = GetSignal (name);
if (p == null && Parent != null)
p = Parent.GetSignalRecursively (name, true);
if (check_self && p == null && interfaces != null) {
foreach (string iface in interfaces) {
ClassBase igen = SymbolTable.GetClassGen (iface);
p = igen.GetSignalRecursively (name, true);
if (p != null)
break;
}
}
return p;
}
public bool Implements (string iface)
{
if (interfaces != null)
return interfaces.Contains (iface);
else
return false;
}
} }
} }

52
generator/Ctor.cs
View file

@ -17,15 +17,18 @@ namespace GtkSharp.Generation {
private XmlElement elem; private XmlElement elem;
private Parameters parms; private Parameters parms;
private bool preferred; private bool preferred;
private String clashName = null;
private ClassBase container_type;
public bool Preferred { public bool Preferred {
get { return preferred; } get { return preferred; }
set { preferred = value; } set { preferred = value; }
} }
public Ctor (string libname, XmlElement elem) { public Ctor (string libname, XmlElement elem, ClassBase container_type) {
this.libname = libname; this.libname = libname;
this.elem = elem; this.elem = elem;
this.container_type = container_type;
XmlElement parms_elem = elem ["parameters"]; XmlElement parms_elem = elem ["parameters"];
if (parms_elem != null) if (parms_elem != null)
parms = new Parameters (parms_elem); parms = new Parameters (parms_elem);
@ -53,13 +56,33 @@ namespace GtkSharp.Generation {
if (clash_map.ContainsKey (sigtypes)) { if (clash_map.ContainsKey (sigtypes)) {
int num = (int) clash_map[sigtypes]; int num = (int) clash_map[sigtypes];
clash_map[sigtypes] = ++num; clash_map[sigtypes] = ++num;
Console.WriteLine ("CLASH: {0} {1}", elem.GetAttribute ("cname"), num);
} }
else else
clash_map[sigtypes] = 0; clash_map[sigtypes] = 0;
} }
public void Generate (StreamWriter sw, Hashtable clash_map) public void Initialize (Hashtable clash_map)
{
string sig = "()";
string sigtypes = "";
if (parms != null) {
sig = "(" + parms.Signature + ")";
sigtypes = parms.SignatureTypes;
}
int clashes = (int) clash_map[sigtypes];
string cname = elem.GetAttribute("cname");
if (clashes > 0 && !Preferred) {
String mname = cname.Substring(cname.IndexOf("new"));
mname = mname.Substring(0,1).ToUpper() + mname.Substring(1);
int idx;
while ((idx = mname.IndexOf("_")) > 0) {
mname = mname.Substring(0, idx) + mname.Substring(idx+1, 1).ToUpper() + mname.Substring(idx+2);
}
clashName = mname + sig;
}
}
public void Generate (StreamWriter sw)
{ {
string sigtypes = ""; string sigtypes = "";
string sig = "()"; string sig = "()";
@ -72,8 +95,6 @@ namespace GtkSharp.Generation {
sigtypes = parms.SignatureTypes; sigtypes = parms.SignatureTypes;
} }
int clashes = (int) clash_map[sigtypes];
string cname = elem.GetAttribute("cname"); string cname = elem.GetAttribute("cname");
string name = ((XmlElement)elem.ParentNode).GetAttribute("name"); string name = ((XmlElement)elem.ParentNode).GetAttribute("name");
string safety; string safety;
@ -88,15 +109,22 @@ namespace GtkSharp.Generation {
sw.WriteLine("\t\t/// <summary> " + name + " Constructor </summary>"); sw.WriteLine("\t\t/// <summary> " + name + " Constructor </summary>");
sw.WriteLine("\t\t/// <remarks> To be completed </remarks>"); sw.WriteLine("\t\t/// <remarks> To be completed </remarks>");
if (clashes > 0 && !Preferred) { if (clashName != null) {
String mname = cname.Substring(cname.IndexOf("new")); string modifiers = "";
mname = mname.Substring(0,1).ToUpper() + mname.Substring(1); Ctor dup = null;
int idx; ObjectGen parent = (ObjectGen) container_type.Parent;
while ((idx = mname.IndexOf("_")) > 0) { while (dup == null && parent != null) {
mname = mname.Substring(0, idx) + mname.Substring(idx+1, 1).ToUpper() + mname.Substring(idx+2); foreach (Ctor c in parent.Ctors) {
if (c.clashName == clashName) {
dup = c;
modifiers = "new ";
break;
}
}
parent = (ObjectGen) parent.Parent;
} }
sw.WriteLine("\t\tpublic static " + safety + name + " " + mname + sig); sw.WriteLine("\t\tpublic static " + safety + modifiers + name + " " + clashName);
sw.WriteLine("\t\t{"); sw.WriteLine("\t\t{");
if (parms != null) if (parms != null)
parms.Initialize(sw, false, ""); parms.Initialize(sw, false, "");

33
generator/Method.cs
View file

@ -126,8 +126,8 @@ namespace GtkSharp.Generation {
else else
safety = ""; safety = "";
is_get = ((parms != null && (parms.IsAccessor || (parms.Count == 0 && s_ret != "void")) || (parms == null && s_ret != "void")) && Name.Substring(0, 3) == "Get"); is_get = ((parms != null && (parms.IsAccessor || (parms.Count == 0 && s_ret != "void")) || (parms == null && s_ret != "void")) && Name.Length > 3 && Name.Substring(0, 3) == "Get");
is_set = ((parms != null && (parms.IsAccessor || (parms.Count == 1 && s_ret == "void"))) && (Name.Substring(0, 3) == "Set")); is_set = ((parms != null && (parms.IsAccessor || (parms.Count == 1 && s_ret == "void"))) && (Name.Length > 3 && Name.Substring(0, 3) == "Set"));
if (parms != null) { if (parms != null) {
parms.CreateSignature (is_set); parms.CreateSignature (is_set);
@ -168,9 +168,20 @@ namespace GtkSharp.Generation {
return container_type.GetMethod (complement + elem.GetAttribute("name").Substring (1)); return container_type.GetMethod (complement + elem.GetAttribute("name").Substring (1));
} }
private void GenerateDeclCommon (StreamWriter sw) private void GenerateDeclCommon (StreamWriter sw, ClassBase implementor)
{ {
sw.Write(safety); sw.Write(safety);
Method dup = null;
if (Name == "ToString")
sw.Write("override ");
else if (elem.HasAttribute("new_flag") || (container_type != null && (dup = container_type.GetMethodRecursively (Name)) != null) || (implementor != null && (dup = implementor.GetMethodRecursively (Name)) != null)) {
if (dup != null && dup.parms != null)
dup.parms.CreateSignature (false);
if (Name == "Toggle") Console.WriteLine ("FOOK {0} {1}", (dup.parms != null) ? dup.parms.Signature : null, (parms != null) ? parms.Signature : null);
if (dup != null && ((dup.parms != null && dup.parms.Signature == parms.Signature) || (dup.parms == null && parms == null)))
sw.Write("new ");
}
if (is_get || is_set) { if (is_get || is_set) {
if (s_ret == "void") if (s_ret == "void")
s_ret = parms.AccessorReturnType; s_ret = parms.AccessorReturnType;
@ -179,8 +190,6 @@ namespace GtkSharp.Generation {
sw.Write(Name.Substring (3)); sw.Write(Name.Substring (3));
sw.WriteLine(" { "); sw.WriteLine(" { ");
} else { } else {
if (elem.HasAttribute("new_flag") || (container_type.Parent != null && container_type.Parent.GetMethodRecursively (Name) != null))
sw.Write("new ");
sw.Write(s_ret + " " + Name + sig); sw.Write(s_ret + " " + Name + sig);
} }
} }
@ -199,7 +208,7 @@ namespace GtkSharp.Generation {
return; return;
sw.Write("\t\t"); sw.Write("\t\t");
GenerateDeclCommon (sw); GenerateDeclCommon (sw, null);
sw.Write("\t\t\t"); sw.Write("\t\t\t");
sw.Write ((is_get) ? "get;" : "set;"); sw.Write ((is_get) ? "get;" : "set;");
@ -214,7 +223,7 @@ namespace GtkSharp.Generation {
else else
{ {
sw.Write("\t\t"); sw.Write("\t\t");
GenerateDeclCommon (sw); GenerateDeclCommon (sw, null);
sw.WriteLine (";"); sw.WriteLine (";");
} }
@ -243,12 +252,12 @@ namespace GtkSharp.Generation {
sw.WriteLine(); sw.WriteLine();
} }
public void Generate (StreamWriter sw) public void Generate (StreamWriter sw, ClassBase implementor)
{ {
Generate (sw, true); Generate (sw, implementor, true);
} }
public void Generate (StreamWriter sw, bool gen_docs) public void Generate (StreamWriter sw, ClassBase implementor, bool gen_docs)
{ {
Method comp = null; Method comp = null;
@ -258,7 +267,7 @@ namespace GtkSharp.Generation {
/* we are generated by the get Method, if there is one */ /* we are generated by the get Method, if there is one */
if (is_set || is_get) if (is_set || is_get)
{ {
if (container_type.GetProperty (Name.Substring (3)) != null) if (container_type.GetPropertyRecursively (Name.Substring (3)) != null)
return; return;
comp = GetComplement (); comp = GetComplement ();
if (comp != null && comp.Validate () && is_set && parms.AccessorReturnType == comp.s_ret) if (comp != null && comp.Validate () && is_set && parms.AccessorReturnType == comp.s_ret)
@ -285,7 +294,7 @@ namespace GtkSharp.Generation {
sw.Write("\t\t"); sw.Write("\t\t");
if (protection != "") if (protection != "")
sw.Write("{0} ", protection); sw.Write("{0} ", protection);
GenerateDeclCommon (sw); GenerateDeclCommon (sw, implementor);
if (is_get || is_set) if (is_get || is_set)
{ {

55
generator/ObjectGen.cs
View file

@ -15,6 +15,8 @@ namespace GtkSharp.Generation {
private ArrayList ctors = new ArrayList(); private ArrayList ctors = new ArrayList();
private ArrayList strings = new ArrayList(); private ArrayList strings = new ArrayList();
private bool ctors_initted = false;
private Hashtable clash_map;
public ObjectGen (XmlElement ns, XmlElement elem) : base (ns, elem) public ObjectGen (XmlElement ns, XmlElement elem) : base (ns, elem)
{ {
@ -30,7 +32,7 @@ namespace GtkSharp.Generation {
break; break;
case "constructor": case "constructor":
ctors.Add (new Ctor (LibraryName, member)); ctors.Add (new Ctor (LibraryName, member, this));
break; break;
case "static-string": case "static-string":
@ -63,6 +65,8 @@ namespace GtkSharp.Generation {
sw.Write (" : " + cs_parent); sw.Write (" : " + cs_parent);
if (interfaces != null) { if (interfaces != null) {
foreach (string iface in interfaces) { foreach (string iface in interfaces) {
if (Parent != null && Parent.Implements (iface))
continue;
sw.Write (", " + SymbolTable.GetCSType (iface)); sw.Write (", " + SymbolTable.GetCSType (iface));
} }
} }
@ -86,10 +90,10 @@ namespace GtkSharp.Generation {
if (has_sigs && Elem.HasAttribute("parent")) if (has_sigs && Elem.HasAttribute("parent"))
{ {
sw.WriteLine("\t\tprivate Hashtable Signals = new Hashtable();"); sw.WriteLine("\t\tprivate Hashtable Signals = new Hashtable();");
GenSignals (sw, true); GenSignals (sw, null, true);
} }
GenMethods (sw, null, true); GenMethods (sw, null, null, true);
if (interfaces != null) { if (interfaces != null) {
Hashtable all_methods = new Hashtable (); Hashtable all_methods = new Hashtable ();
@ -105,9 +109,11 @@ namespace GtkSharp.Generation {
} }
foreach (string iface in interfaces) { foreach (string iface in interfaces) {
if (Parent != null && Parent.Implements (iface))
continue;
ClassBase igen = SymbolTable.GetClassGen (iface); ClassBase igen = SymbolTable.GetClassGen (iface);
igen.GenMethods (sw, collisions, false); igen.GenMethods (sw, collisions, this, false);
igen.GenSignals (sw, false); igen.GenSignals (sw, this, false);
} }
} }
@ -159,14 +165,14 @@ namespace GtkSharp.Generation {
return true; return true;
} }
private void GenCtors (StreamWriter sw) public ArrayList Ctors { get { return ctors; } }
{
if (!Elem.HasAttribute("parent"))
return;
sw.WriteLine("\t\tpublic " + Name + "(IntPtr raw) : base(raw) {}");
sw.WriteLine();
Hashtable clash_map = new Hashtable(); private void InitializeCtors ()
{
if (ctors_initted)
return;
clash_map = new Hashtable();
if (ctors != null) { if (ctors != null) {
bool has_preferred = false; bool has_preferred = false;
@ -183,9 +189,32 @@ namespace GtkSharp.Generation {
if (!has_preferred && ctors.Count > 0) if (!has_preferred && ctors.Count > 0)
((Ctor) ctors[0]).Preferred = true; ((Ctor) ctors[0]).Preferred = true;
foreach (Ctor ctor in ctors)
if (ctor.Validate ()) {
ctor.Initialize (clash_map);
}
}
ctors_initted = true;
}
private void GenCtors (StreamWriter sw)
{
if (!Elem.HasAttribute("parent"))
return;
ObjectGen klass = this;
while (klass != null) {
klass.InitializeCtors ();
klass = (ObjectGen) klass.Parent;
}
sw.WriteLine("\t\tpublic " + Name + "(IntPtr raw) : base(raw) {}");
sw.WriteLine();
if (ctors != null) {
foreach (Ctor ctor in ctors) { foreach (Ctor ctor in ctors) {
if (ctor.Validate ()) if (ctor.Validate ())
ctor.Generate (sw, clash_map); ctor.Generate (sw);
} }
} }

11
generator/Signal.cs
View file

@ -16,11 +16,13 @@ namespace GtkSharp.Generation {
private string marsh; private string marsh;
private string name; private string name;
private XmlElement elem; private XmlElement elem;
private ClassBase container_type;
public Signal (XmlElement elem) public Signal (XmlElement elem, ClassBase container_type)
{ {
this.elem = elem; this.elem = elem;
this.name = elem.GetAttribute ("name"); this.name = elem.GetAttribute ("name");
this.container_type = container_type;
} }
public string Name { public string Name {
@ -47,8 +49,9 @@ namespace GtkSharp.Generation {
public void GenerateDecl (StreamWriter sw) public void GenerateDecl (StreamWriter sw)
{ {
GenComments (sw); GenComments (sw);
if (elem.HasAttribute("new_flag")) if (elem.HasAttribute("new_flag") || (container_type != null && container_type.GetSignalRecursively (Name) != null))
sw.Write("new "); sw.Write("new ");
sw.WriteLine ("\t\tevent EventHandler " + Name + ";"); sw.WriteLine ("\t\tevent EventHandler " + Name + ";");
} }
@ -61,7 +64,7 @@ namespace GtkSharp.Generation {
sw.WriteLine("\t\t/// </remarks>"); sw.WriteLine("\t\t/// </remarks>");
} }
public void Generate (StreamWriter sw, bool gen_docs) public void Generate (StreamWriter sw, ClassBase implementor, bool gen_docs)
{ {
string cname = "\"" + elem.GetAttribute("cname") + "\""; string cname = "\"" + elem.GetAttribute("cname") + "\"";
marsh = "GtkSharp." + marsh; marsh = "GtkSharp." + marsh;
@ -69,7 +72,7 @@ namespace GtkSharp.Generation {
if (gen_docs) if (gen_docs)
GenComments (sw); GenComments (sw);
sw.Write("\t\tpublic "); sw.Write("\t\tpublic ");
if (elem.HasAttribute("new_flag")) if (elem.HasAttribute("new_flag") || (container_type != null && container_type.GetSignalRecursively (Name) != null) || (implementor != null && implementor.GetSignalRecursively (Name) != null))
sw.Write("new "); sw.Write("new ");
sw.WriteLine("event EventHandler " + Name + " {"); sw.WriteLine("event EventHandler " + Name + " {");
sw.WriteLine("\t\t\tadd {"); sw.WriteLine("\t\t\tadd {");

4
generator/StructGen.cs
View file

@ -21,12 +21,12 @@ namespace GtkSharp.Generation {
} }
} }
public String CallByName (String var_name) public override String CallByName (String var_name)
{ {
return var_name; return var_name;
} }
public String FromNative(String var) public override String FromNative(String var)
{ {
return var; return var;
} }

206
generator/gtkapi.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<api> <api>
<namespace name="Gnome" library="libgnomecanvas-2.so.0"> <namespace name="Gnome" library="gnomecanvas-2">
<object name="Canvas" cname="GnomeCanvas" parent="GtkLayout"> <object name="Canvas" cname="GnomeCanvas" parent="GtkLayout">
<field cname="root" type="GnomeCanvasItem*"/> <field cname="root" type="GnomeCanvasItem*"/>
<field cname="redraw_area" type="ArtUta*"/> <field cname="redraw_area" type="ArtUta*"/>
@ -326,7 +326,7 @@
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="const-gchar*" name="first_arg_name"/> <parameter type="const-gchar*" name="first_arg_name"/>
<parameter type="c"/> <parameter type="c" name=""/>
</parameters> </parameters>
</method> </method>
<method name="AffineAbsolute" cname="gnome_canvas_item_affine_absolute"> <method name="AffineAbsolute" cname="gnome_canvas_item_affine_absolute">
@ -355,7 +355,7 @@
<parameter type="GnomeCanvasGroup*" name="parent"/> <parameter type="GnomeCanvasGroup*" name="parent"/>
<parameter type="GType" name="type"/> <parameter type="GType" name="type"/>
<parameter type="const-gchar*" name="first_arg_name"/> <parameter type="const-gchar*" name="first_arg_name"/>
<parameter type="o"/> <parameter type="o" name=""/>
</parameters> </parameters>
</constructor> </constructor>
<method name="I2cAffine" cname="gnome_canvas_item_i2c_affine"> <method name="I2cAffine" cname="gnome_canvas_item_i2c_affine">
@ -879,7 +879,7 @@
<field cname="bitmap" type="FT_Bitmap"/> <field cname="bitmap" type="FT_Bitmap"/>
</struct> </struct>
</namespace> </namespace>
<namespace name="Gnome" library="libgnome-2.so.0"> <namespace name="Gnome" library="gnome-2">
<enum name="FileDomain" cname="GnomeFileDomain" type="enum"> <enum name="FileDomain" cname="GnomeFileDomain" type="enum">
<member cname="GNOME_FILE_DOMAIN_UNKNOWN" name="Unknown"/> <member cname="GNOME_FILE_DOMAIN_UNKNOWN" name="Unknown"/>
<member cname="GNOME_FILE_DOMAIN_LIBDIR" name="Libdir"/> <member cname="GNOME_FILE_DOMAIN_LIBDIR" name="Libdir"/>
@ -940,7 +940,7 @@
<field cname="_priv" type="GnomeProgramPrivate*"/> <field cname="_priv" type="GnomeProgramPrivate*"/>
<property name="PoptTable" cname="popt-table" type="gpointer" doc-string=" _(The table of options for popt)" writeable="true" construct-only="true"/> <property name="PoptTable" cname="popt-table" type="gpointer" doc-string=" _(The table of options for popt)" writeable="true" construct-only="true"/>
<property name="PoptFlags" cname="popt-flags" type="gint" doc-string=" _(The flags to use for popt)" writeable="true" construct-only="true"/> <property name="PoptFlags" cname="popt-flags" type="gint" doc-string=" _(The flags to use for popt)" writeable="true" construct-only="true"/>
<property name="PoptContext" cname="popt-context" type="gpointer" doc-string=" _(The popt context pointer that GnomeProgram is using)" readable="true"/> <property name="PoptContext" cname="popt-context" type="gpointer" doc-string=" _(The popt context pointer that GnomeProgramis using)" readable="true"/>
<property name="HumanReadableName" cname="human-readable-name" type="gchar*" doc-string=" _(Human readable name of this application)" readable="true" writeable="true" construct-only="true"/> <property name="HumanReadableName" cname="human-readable-name" type="gchar*" doc-string=" _(Human readable name of this application)" readable="true" writeable="true" construct-only="true"/>
<property name="GnomePath" cname="gnome-path" type="gchar*" doc-string=" _(Path in which to look for installed files)" readable="true" writeable="true" construct-only="true"/> <property name="GnomePath" cname="gnome-path" type="gchar*" doc-string=" _(Path in which to look for installed files)" readable="true" writeable="true" construct-only="true"/>
<property name="AppId" cname="app-id" type="gchar*" doc-string=" _(ID string to use for this application)" readable="true"/> <property name="AppId" cname="app-id" type="gchar*" doc-string=" _(ID string to use for this application)" readable="true"/>
@ -948,11 +948,11 @@
<property name="GnomePrefix" cname="gnome-prefix" type="gchar*" doc-string=" _(Prefix where GNOME was installed)" readable="true" writeable="true" construct-only="true"/> <property name="GnomePrefix" cname="gnome-prefix" type="gchar*" doc-string=" _(Prefix where GNOME was installed)" readable="true" writeable="true" construct-only="true"/>
<property name="GnomeLibdir" cname="gnome-libdir" type="gchar*" doc-string=" _(Library prefix where GNOME was installed)" readable="true" writeable="true" construct-only="true"/> <property name="GnomeLibdir" cname="gnome-libdir" type="gchar*" doc-string=" _(Library prefix where GNOME was installed)" readable="true" writeable="true" construct-only="true"/>
<property name="GnomeDatadir" cname="gnome-datadir" type="gchar*" doc-string=" _(Data prefix where GNOME was installed)" readable="true" writeable="true" construct-only="true"/> <property name="GnomeDatadir" cname="gnome-datadir" type="gchar*" doc-string=" _(Data prefix where GNOME was installed)" readable="true" writeable="true" construct-only="true"/>
<property name="GnomeSysconfdir" cname="gnome-sysconfdir" type="gchar*" doc-string=" _(Configuration prefix where GNOME was installed)" readable="true" writeable="true" construct-only="true"/> <property name="GnomeSysconfdir" cname="gnome-sysconfdir" type="gchar*" doc-string=" _(Configuration prefix where GNOMEwas installed)" readable="true" writeable="true" construct-only="true"/>
<property name="AppPrefix" cname="app-prefix" type="gchar*" doc-string=" _(Prefix where this application was installed)" readable="true" writeable="true"/> <property name="AppPrefix" cname="app-prefix" type="gchar*" doc-string=" _(Prefix where this application was installed)" readable="true" writeable="true"/>
<property name="AppLibdir" cname="app-libdir" type="gchar*" doc-string=" _(Library prefix where this application was installed)" readable="true" writeable="true"/> <property name="AppLibdir" cname="app-libdir" type="gchar*" doc-string=" _(Library prefix where this applicationwas installed)" readable="true" writeable="true"/>
<property name="AppDatadir" cname="app-datadir" type="gchar*" doc-string=" _(Data prefix where this application was installed)" readable="true" writeable="true"/> <property name="AppDatadir" cname="app-datadir" type="gchar*" doc-string=" _(Data prefix where this applicationwas installed)" readable="true" writeable="true"/>
<property name="AppSysconfdir" cname="app-sysconfdir" type="gchar*" doc-string=" _(Configuration prefix where this application was installed)" readable="true" writeable="true"/> <property name="AppSysconfdir" cname="app-sysconfdir" type="gchar*" doc-string=" _(Configuration prefix where this applicationwas installed)" readable="true" writeable="true"/>
<property name="CreateDirectories" cname="create-directories" type="gboolean" doc-string=" _(Create standard GNOME directories on startup)" readable="true" writeable="true" construct-only="true"/> <property name="CreateDirectories" cname="create-directories" type="gboolean" doc-string=" _(Create standard GNOME directories on startup)" readable="true" writeable="true" construct-only="true"/>
<property name="EnableSound" cname="enable-sound" type="gboolean" doc-string=" _(Enable sound on startup)" readable="true" writeable="true" construct-only="true"/> <property name="EnableSound" cname="enable-sound" type="gboolean" doc-string=" _(Enable sound on startup)" readable="true" writeable="true" construct-only="true"/>
<property name="Espeaker" cname="espeaker" type="gchar*" doc-string=" _(How to connect to esd)" readable="true" writeable="true" construct-only="true"/> <property name="Espeaker" cname="espeaker" type="gchar*" doc-string=" _(How to connect to esd)" readable="true" writeable="true" construct-only="true"/>
@ -2148,7 +2148,7 @@
<field cname="layout" type="PangoLayout*"/> <field cname="layout" type="PangoLayout*"/>
<field cname="line_list_link" type="GSList*"/> <field cname="line_list_link" type="GSList*"/>
<field cname="line" type="PangoLayoutLine*"/> <field cname="line" type="PangoLayoutLine*"/>
<field cname="at the end of the line with 0 width*/GSList* run_list_link" type="*"/> <field cname="run_list_link" type="GSList*"/>
<field cname="run" type="PangoLayoutRun*"/> <field cname="run" type="PangoLayoutRun*"/>
<field cname="index" type="int"/> <field cname="index" type="int"/>
<field cname="logical_rect" type="PangoRectangle"/> <field cname="logical_rect" type="PangoRectangle"/>
@ -2158,7 +2158,7 @@
<field cname="run_is_shaped" type="gboolean"/> <field cname="run_is_shaped" type="gboolean"/>
<field cname="run_logical_rect" type="PangoRectangle"/> <field cname="run_logical_rect" type="PangoRectangle"/>
<field cname="ltr" type="gboolean"/> <field cname="ltr" type="gboolean"/>
<field cname="right side according to text direction*/int cluster_x" type="*"/> <field cname="cluster_x" type="int"/>
<field cname="cluster_index" type="int"/> <field cname="cluster_index" type="int"/>
<field cname="cluster_start" type="int"/> <field cname="cluster_start" type="int"/>
<field cname="next_cluster_start" type="int"/> <field cname="next_cluster_start" type="int"/>
@ -2356,7 +2356,7 @@
<parameter type="gboolean" name="positions_in_pixels"/> <parameter type="gboolean" name="positions_in_pixels"/>
<parameter type="PangoTabAlign" name="first_alignment"/> <parameter type="PangoTabAlign" name="first_alignment"/>
<parameter type="gint" name="first_position"/> <parameter type="gint" name="first_position"/>
<parameter type="g"/> <parameter type="g" name=""/>
</parameters> </parameters>
</constructor> </constructor>
<method name="GetTab" cname="pango_tab_array_get_tab"> <method name="GetTab" cname="pango_tab_array_get_tab">
@ -2423,7 +2423,7 @@
</struct> </struct>
<alias name="XSubfont" cname="PangoXSubfont" type="guint16 "/> <alias name="XSubfont" cname="PangoXSubfont" type="guint16 "/>
</namespace> </namespace>
<namespace name="Gnome" library="libgnomeui-2.so.0"> <namespace name="Gnome" library="gnomeui-2">
<enum name="ClientFlags" cname="GnomeClientFlags" type="flags"> <enum name="ClientFlags" cname="GnomeClientFlags" type="flags">
<member cname="GNOME_CLIENT_IS_CONNECTED" name="IsConnected" value="1 &lt;&lt; 0"/> <member cname="GNOME_CLIENT_IS_CONNECTED" name="IsConnected" value="1 &lt;&lt; 0"/>
<member cname="GNOME_CLIENT_RESTARTED" name="Restarted" value="1 &lt;&lt; 1"/> <member cname="GNOME_CLIENT_RESTARTED" name="Restarted" value="1 &lt;&lt; 1"/>
@ -3051,7 +3051,7 @@
<method name="AddStaticArg" cname="gnome_client_add_static_arg"> <method name="AddStaticArg" cname="gnome_client_add_static_arg">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GnomeClient *client, ..."/> <parameter type="GnomeClient *client, ..." name=""/>
</parameters> </parameters>
</method> </method>
<method name="RequestInteraction" cname="gnome_client_request_interaction"> <method name="RequestInteraction" cname="gnome_client_request_interaction">
@ -3109,13 +3109,13 @@
<parameter type="guint" name="a"/> <parameter type="guint" name="a"/>
</parameters> </parameters>
</signal> </signal>
<property name="Dither" cname="dither" type="gboolean" doc-string=" Whether or not to dither to color" readable="true" writeable="true"/> <property name="Dither" cname="dither" type="gboolean" doc-string="Whether or not to dither to color" readable="true" writeable="true"/>
<property name="UseAlpha" cname="use_alpha" type="gboolean" doc-string=" Whether or not to give the color an alpha value" readable="true" writeable="true"/> <property name="UseAlpha" cname="use_alpha" type="gboolean" doc-string="Whether or not to give the color an alpha value" readable="true" writeable="true"/>
<property name="Title" cname="title" type="gchar*" doc-string=" The title to give to the color picker" readable="true" writeable="true"/> <property name="Title" cname="title" type="gchar*" doc-string="The title to give to the color picker" readable="true" writeable="true"/>
<property name="Red" cname="red" type="guint" doc-string=" The amount of red in the chosen color" readable="true" writeable="true"/> <property name="Red" cname="red" type="guint" doc-string="The amount of red in the chosen color" readable="true" writeable="true"/>
<property name="Green" cname="green" type="guint" doc-string=" The amount of green in the chosen color" readable="true" writeable="true"/> <property name="Green" cname="green" type="guint" doc-string="The amount of green in the chosen color" readable="true" writeable="true"/>
<property name="Blue" cname="blue" type="guint" doc-string=" The amount of blue in the chosen color" readable="true" writeable="true"/> <property name="Blue" cname="blue" type="guint" doc-string="The amount of blue in the chosen color" readable="true" writeable="true"/>
<property name="Alpha" cname="alpha" type="guint" doc-string=" The alpha value of the chosen color" readable="true" writeable="true"/> <property name="Alpha" cname="alpha" type="guint" doc-string="The alpha value of the chosen color" readable="true" writeable="true"/>
<constructor cname="gnome_color_picker_new"/> <constructor cname="gnome_color_picker_new"/>
<method name="GetI8" cname="gnome_color_picker_get_i8"> <method name="GetI8" cname="gnome_color_picker_get_i8">
<return-type type="void"/> <return-type type="void"/>
@ -3201,10 +3201,10 @@
</object> </object>
<object name="DateEdit" cname="GnomeDateEdit" parent="GtkHBox"> <object name="DateEdit" cname="GnomeDateEdit" parent="GtkHBox">
<field cname="_priv" type="GnomeDateEditPrivate*"/> <field cname="_priv" type="GnomeDateEditPrivate*"/>
<property name="Time" cname="time" type="ulong" doc-string=" _(The time currently selected)" readable="true" writeable="true"/> <property name="Time" cname="time" type="ulong" doc-string=" _(The time currentlyselected)" readable="true" writeable="true"/>
<property name="DateeditFlags" cname="dateedit_flags" type="GnomeDateEditFlags" doc-string=" _(Flags for how DateEdit looks)" readable="true" writeable="true"/> <property name="DateeditFlags" cname="dateedit_flags" type="GnomeDateEditFlags" doc-string=" _(Flags for howDateEdit looks)" readable="true" writeable="true"/>
<property name="LowerHour" cname="lower_hour" type="gint" doc-string=" _(Lower hour in the time popup selector)" readable="true" writeable="true"/> <property name="LowerHour" cname="lower_hour" type="gint" doc-string=" _(Lower hour inthe time popupselector)" readable="true" writeable="true"/>
<property name="UpperHour" cname="upper_hour" type="gint" doc-string=" _(Upper hour in the time popup selector)" readable="true" writeable="true"/> <property name="UpperHour" cname="upper_hour" type="gint" doc-string=" _(Upper hour inthe time popupselector)" readable="true" writeable="true"/>
<property name="InitialTime" cname="initial_time" type="ulong" doc-string=" _(The initial time)" readable="true" writeable="true"/> <property name="InitialTime" cname="initial_time" type="ulong" doc-string=" _(The initial time)" readable="true" writeable="true"/>
<signal name="TimeChanged" cname="time_changed" when="FIRST"> <signal name="TimeChanged" cname="time_changed" when="FIRST">
<return-type type="void"/> <return-type type="void"/>
@ -3668,24 +3668,24 @@
<parameter type="GnomeFileEntry*" name="fentry"/> <parameter type="GnomeFileEntry*" name="fentry"/>
</parameters> </parameters>
</signal> </signal>
<signal name="Activate" cname="activate" when="LAST"> <signal name="Activated" cname="activate" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GnomeFileEntry*" name="fentry"/> <parameter type="GnomeFileEntry*" name="fentry"/>
</parameters> </parameters>
</signal> </signal>
<property name=" historyId" cname=" history_id" type="gchar*" doc-string=" _(Unique identifier for the file entry. This will be used to save the history list.)" readable="true" writeable="true"/> <property name="HistoryId" cname="history_id" type="gchar*" doc-string=" _(Unique identifier for the file entry.This will be used to save the history list.)" readable="true" writeable="true"/>
<property name=" browseDialogTitle" cname=" browse_dialog_title" type="gchar*" doc-string=" _(Title for the Browse file dialog.)" readable="true" writeable="true"/> <property name="BrowseDialogTitle" cname="browse_dialog_title" type="gchar*" doc-string=" _(Title for the Browse file dialog.)" readable="true" writeable="true"/>
<property name=" directoryEntry" cname=" directory_entry" type="gboolean" doc-string=" _(Whether the file entry is being used to enter directory names or complete filenames.)" readable="true" writeable="true"/> <property name="DirectoryEntry" cname="directory_entry" type="gboolean" doc-string=" _(Whether the file entry is being used toenter directory names or complete filenames.)" readable="true" writeable="true"/>
<property name=" modal" cname=" modal" type="gboolean" doc-string=" _(Whether the Browse file window should be modal.)" readable="true" writeable="true"/> <property name="Modal" cname="modal" type="gboolean" doc-string=" _(Whether the Browse file window should be modal.)" readable="true" writeable="true"/>
<property name=" filename" cname=" filename" type="gchar*" doc-string=" _(Filename that should be displayed in the file entry.)" readable="true" writeable="true"/> <property name="Filename" cname="filename" type="gchar*" doc-string=" _(Filename that should be displayed in thefile entry.)" readable="true" writeable="true"/>
<property name=" defaultPath" cname=" default_path" type="gchar*" doc-string=" _(Default path for the Browse file window.)" readable="true" writeable="true"/> <property name="DefaultPath" cname="default_path" type="gchar*" doc-string=" _(Default path for the Browse file window.)" readable="true" writeable="true"/>
<property name=" gnomeEntry" cname=" gnome_entry" type="GnomeEntry" doc-string=" _(GnomeEntry that the file entry uses for entering filenames. You can use this property to get the GnomeEntry if you need to modify or query any of its parameters.)" readable="true"/> <property name="GnomeEntry" cname="gnome_entry" type="GnomeEntry" doc-string=" _(GnomeEntry that the file entry uses forentering filenames. You can use this propertyto get the GnomeEntry if you need to modifyor query any of its parameters.)" readable="true"/>
<property name=" gtkEntry" cname=" gtk_entry" type="GtkEntry" doc-string=" _(GtkEntry that the file entry uses for entering filenames. You can use this property to get the GtkEntry if you need to modify or query any of its parameters.)" readable="true"/> <property name="GtkEntry" cname="gtk_entry" type="GtkEntry" doc-string=" _(GtkEntry that the file entry uses forentering filenames. You can use this propertyto get the GtkEntry if you need to modifyor query any of its parameters.)" readable="true"/>
<implements> <implements>
<interface cname="GtkEditable"/> <interface cname="GtkEditable"/>
</implements> </implements>
<method name="GnomeEntry" cname="gnome_file_entry_gnome_entry"> <method name="GnomeEntry" cname="gnome_file_entry_gnome_entry" hidden="1">
<return-type type="GtkWidget*"/> <return-type type="GtkWidget*"/>
</method> </method>
<method name="GetFullPath" cname="gnome_file_entry_get_full_path"> <method name="GetFullPath" cname="gnome_file_entry_get_full_path">
@ -3721,7 +3721,7 @@
<parameter type="const-char*" name="filename"/> <parameter type="const-char*" name="filename"/>
</parameters> </parameters>
</method> </method>
<method name="GtkEntry" cname="gnome_file_entry_gtk_entry"> <method name="GtkEntry" cname="gnome_file_entry_gtk_entry" hidden="1">
<return-type type="GtkWidget*"/> <return-type type="GtkWidget*"/>
</method> </method>
<method name="GetDirectoryEntry" cname="gnome_file_entry_get_directory_entry"> <method name="GetDirectoryEntry" cname="gnome_file_entry_get_directory_entry">
@ -3874,11 +3874,11 @@
<parameter type="GnomeIconEntry*" name="ientry"/> <parameter type="GnomeIconEntry*" name="ientry"/>
</parameters> </parameters>
</signal> </signal>
<property name=" historyId" cname=" history_id" type="gchar*" doc-string=" _(Unique identifier for the icon entry. This will be used to save the history list.)" readable="true" writeable="true"/> <property name="HistoryId" cname="history_id" type="gchar*" doc-string=" _(Unique identifier for the icon entry.This will be used to save the history list.)" readable="true" writeable="true"/>
<property name=" browseDialogTitle" cname=" browse_dialog_title" type="gchar*" doc-string=" _(Title for the Browse icon dialog.)" readable="true" writeable="true"/> <property name="BrowseDialogTitle" cname="browse_dialog_title" type="gchar*" doc-string=" _(Title for the Browse icon dialog.)" readable="true" writeable="true"/>
<property name=" pixmapSubdir" cname=" pixmap_subdir" type="gchar*" doc-string=" _(Directory that will be searched for icons.)" readable="true" writeable="true"/> <property name="PixmapSubdir" cname="pixmap_subdir" type="gchar*" doc-string=" _(Directory that will be searched for icons.)" readable="true" writeable="true"/>
<property name=" filename" cname=" filename" type="gchar*" doc-string=" _(Filename that should be displayed in the icon entry.)" readable="true" writeable="true"/> <property name="Filename" cname="filename" type="gchar*" doc-string=" _(Filename that should be displayed in theicon entry.)" readable="true" writeable="true"/>
<property name=" pickDialog" cname=" pick_dialog" type="GtkDialog" doc-string=" _(Icon picker dialog. You can use this property to get the GtkDialog if you need to modify or query any of its properties.)" readable="true"/> <property name="PickDialog" cname="pick_dialog" type="GtkDialog" doc-string=" _(Icon picker dialog. You can use this propertyto get the GtkDialog if you need to modifyor query any of its properties.)" readable="true"/>
<constructor cname="gnome_icon_entry_new"> <constructor cname="gnome_icon_entry_new">
<parameters> <parameters>
<parameter type="const-gchar*" name="history_id"/> <parameter type="const-gchar*" name="history_id"/>
@ -3900,7 +3900,7 @@
<parameter type="const-gchar*" name="filename"/> <parameter type="const-gchar*" name="filename"/>
</parameters> </parameters>
</method> </method>
<method name="PickDialog" cname="gnome_icon_entry_pick_dialog"> <method name="PickDialog" cname="gnome_icon_entry_pick_dialog" hidden="1">
<return-type type="GtkWidget*"/> <return-type type="GtkWidget*"/>
</method> </method>
<method name="GtkEntry" cname="gnome_icon_entry_gtk_entry"> <method name="GtkEntry" cname="gnome_icon_entry_gtk_entry">
@ -4354,7 +4354,7 @@
</object> </object>
<object name="PixmapEntry" cname="GnomePixmapEntry" parent="GnomeFileEntry"> <object name="PixmapEntry" cname="GnomePixmapEntry" parent="GnomeFileEntry">
<field cname="_priv" type="GnomePixmapEntryPrivate*"/> <field cname="_priv" type="GnomePixmapEntryPrivate*"/>
<property name=" doPreview" cname=" do_preview" type="gboolean" doc-string=" _(Whether the pixmap entry should have a preview.)" readable="true" writeable="true"/> <property name="DoPreview" cname="do_preview" type="gboolean" doc-string=" _(Whether the pixmap entry should have a preview.)" readable="true" writeable="true"/>
<method name="PreviewWidget" cname="gnome_pixmap_entry_preview_widget"> <method name="PreviewWidget" cname="gnome_pixmap_entry_preview_widget">
<return-type type="GtkWidget*"/> <return-type type="GtkWidget*"/>
</method> </method>
@ -4687,7 +4687,6 @@
<field cname="preview_sw" type="GtkWidget*"/> <field cname="preview_sw" type="GtkWidget*"/>
<field cname="last_preview" type="gchar*"/> <field cname="last_preview" type="gchar*"/>
<field cname="do_preview" bits="1" type="guint32"/> <field cname="do_preview" bits="1" type="guint32"/>
<field cname="entry*/" type="the"/>
</struct> </struct>
<struct name="ScoresPrivate" cname="GnomeScoresPrivate"> <struct name="ScoresPrivate" cname="GnomeScoresPrivate">
<field cname="but_clear" type="GtkWidget*"/> <field cname="but_clear" type="GtkWidget*"/>
@ -4740,7 +4739,7 @@
<static-string cname="GNOME_STOCK_VOLUME" name="Volume" value="gnome-stock-volume"/> <static-string cname="GNOME_STOCK_VOLUME" name="Volume" value="gnome-stock-volume"/>
</object> </object>
</namespace> </namespace>
<namespace name="Gtk" library="libgtkhtml-3.0.so.0"> <namespace name="Gtk" library="gtkhtml-3.0">
<enum name="HTMLCommandType" cname="GtkHTMLCommandType" type="enum"> <enum name="HTMLCommandType" cname="GtkHTMLCommandType" type="enum">
<member cname="GTK_HTML_COMMAND_UNDO" name="Undo"/> <member cname="GTK_HTML_COMMAND_UNDO" name="Undo"/>
<member cname="GTK_HTML_COMMAND_REDO" name="Redo"/> <member cname="GTK_HTML_COMMAND_REDO" name="Redo"/>
@ -5079,7 +5078,7 @@
<return-type type="gboolean"/> <return-type type="gboolean"/>
<parameters> <parameters>
<parameter type="GtkHTML*" name="html"/> <parameter type="GtkHTML*" name="html"/>
<parameter type="*"/> <parameter type="*" name=""/>
</parameters> </parameters>
</signal> </signal>
<signal name="CurrentParagraphStyleChanged" cname="current_paragraph_style_changed" when="FIRST"> <signal name="CurrentParagraphStyleChanged" cname="current_paragraph_style_changed" when="FIRST">
@ -7662,7 +7661,7 @@
<parameter type="const-char*" name="filename"/> <parameter type="const-char*" name="filename"/>
<parameter type="const-char*" name="type"/> <parameter type="const-char*" name="type"/>
<parameter type="GError**" name="error"/> <parameter type="GError**" name="error"/>
<parameter type=" "/> <parameter type=" " name=""/>
</parameters> </parameters>
</method> </method>
<method name="GetColorspace" cname="gdk_pixbuf_get_colorspace"> <method name="GetColorspace" cname="gdk_pixbuf_get_colorspace">
@ -8949,7 +8948,7 @@
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GtkTreeIter*" name="iter"/> <parameter type="GtkTreeIter*" name="iter"/>
<parameter type="G"/> <parameter type="G" name=""/>
</parameters> </parameters>
</method> </method>
<method name="GetIterFromString" cname="gtk_tree_model_get_iter_from_string"> <method name="GetIterFromString" cname="gtk_tree_model_get_iter_from_string">
@ -9472,7 +9471,7 @@
<parameter type="GtkButton*" name="button"/> <parameter type="GtkButton*" name="button"/>
</parameters> </parameters>
</signal> </signal>
<signal name="Activate" cname="activate" when="FIRST"> <signal name="Activated" cname="activate" when="FIRST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GtkButton*" name="button"/> <parameter type="GtkButton*" name="button"/>
@ -10137,7 +10136,7 @@
<parameters> <parameters>
<parameter type="GtkWidget*" name="widget"/> <parameter type="GtkWidget*" name="widget"/>
<parameter type="const-gchar*" name="first_prop_name"/> <parameter type="const-gchar*" name="first_prop_name"/>
<parameter type="c"/> <parameter type="c" name=""/>
</parameters> </parameters>
</method> </method>
<method name="CheckResize" cname="gtk_container_check_resize"> <method name="CheckResize" cname="gtk_container_check_resize">
@ -10171,7 +10170,7 @@
<parameters> <parameters>
<parameter type="GtkWidget*" name="child"/> <parameter type="GtkWidget*" name="child"/>
<parameter type="const-gchar*" name="first_prop_name"/> <parameter type="const-gchar*" name="first_prop_name"/>
<parameter type="c"/> <parameter type="c" name=""/>
</parameters> </parameters>
</method> </method>
<method name="SetFocusVadjustment" cname="gtk_container_set_focus_vadjustment"> <method name="SetFocusVadjustment" cname="gtk_container_set_focus_vadjustment">
@ -10269,7 +10268,7 @@
<parameters> <parameters>
<parameter type="GtkWidget*" name="child"/> <parameter type="GtkWidget*" name="child"/>
<parameter type="const-gchar*" name="first_prop_name"/> <parameter type="const-gchar*" name="first_prop_name"/>
<parameter type="c"/> <parameter type="c" name=""/>
</parameters> </parameters>
</method> </method>
<method name="Foreach" cname="gtk_container_foreach"> <method name="Foreach" cname="gtk_container_foreach">
@ -10387,7 +10386,7 @@
<parameter type="GtkWindow*" name="parent"/> <parameter type="GtkWindow*" name="parent"/>
<parameter type="GtkDialogFlags" name="flags"/> <parameter type="GtkDialogFlags" name="flags"/>
<parameter type="const-gchar*" name="first_button_text"/> <parameter type="const-gchar*" name="first_button_text"/>
<parameter type="c"/> <parameter type="c" name=""/>
</parameters> </parameters>
</constructor> </constructor>
<method name="SetHasSeparator" cname="gtk_dialog_set_has_separator"> <method name="SetHasSeparator" cname="gtk_dialog_set_has_separator">
@ -10433,7 +10432,7 @@
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="const-gchar*" name="first_button_text"/> <parameter type="const-gchar*" name="first_button_text"/>
<parameter type="c"/> <parameter type="c" name=""/>
</parameters> </parameters>
</method> </method>
<method name="AddButton" cname="gtk_dialog_add_button"> <method name="AddButton" cname="gtk_dialog_add_button">
@ -10504,7 +10503,7 @@
<parameter type="GtkMenu*" name="menu"/> <parameter type="GtkMenu*" name="menu"/>
</parameters> </parameters>
</signal> </signal>
<signal name="Activate" cname="activate" when="LAST"> <signal name="Activated" cname="activate" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GtkEntry*" name="entry"/> <parameter type="GtkEntry*" name="entry"/>
@ -11495,7 +11494,7 @@
<property name="Wrap" cname="wrap" type="gboolean" doc-string=" _(If set, wrap lines if the text becomes too wide.)" readable="true" writeable="true"/> <property name="Wrap" cname="wrap" type="gboolean" doc-string=" _(If set, wrap lines if the text becomes too wide.)" readable="true" writeable="true"/>
<property name="Selectable" cname="selectable" type="gboolean" doc-string=" _(Whether the label text can be selected with the mouse.)" readable="true" writeable="true"/> <property name="Selectable" cname="selectable" type="gboolean" doc-string=" _(Whether the label text can be selected with the mouse.)" readable="true" writeable="true"/>
<property name="MnemonicKeyval" cname="mnemonic_keyval" type="guint" doc-string=" _(The mnemonic accelerator key for this label.)" readable="true"/> <property name="MnemonicKeyval" cname="mnemonic_keyval" type="guint" doc-string=" _(The mnemonic accelerator key for this label.)" readable="true"/>
<property name="MnemonicWidget" cname="mnemonic_widget" type="GtkWidget" doc-string=" _(The widget to be activated when the label's mnemonic key is pressed.)" readable="true" writeable="true"/> <property name="MnemonicWidget" cname="mnemonic_widget" type="GtkWidget" doc-string=" _(The widget to be activated when the label's mnemonickey is pressed.)" readable="true" writeable="true"/>
<property name="CursorPosition" cname="cursor_position" type="gint" doc-string=" _(The current position of the insertion cursor in chars.)" readable="true"/> <property name="CursorPosition" cname="cursor_position" type="gint" doc-string=" _(The current position of the insertion cursor in chars.)" readable="true"/>
<property name="SelectionBound" cname="selection_bound" type="gint" doc-string=" _(The position of the opposite end of the selection from the cursor in chars.)" readable="true"/> <property name="SelectionBound" cname="selection_bound" type="gint" doc-string=" _(The position of the opposite end of the selection from the cursor in chars.)" readable="true"/>
<method name="SetAttributes" cname="gtk_label_set_attributes"> <method name="SetAttributes" cname="gtk_label_set_attributes">
@ -11656,7 +11655,7 @@
<property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" doc-string=" _(The GtkAdjustment for the vertical position.)" readable="true" writeable="true"/> <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" doc-string=" _(The GtkAdjustment for the vertical position.)" readable="true" writeable="true"/>
<property name="Width" cname="width" type="guint" doc-string=" _(The width of the layout.)" readable="true" writeable="true"/> <property name="Width" cname="width" type="guint" doc-string=" _(The width of the layout.)" readable="true" writeable="true"/>
<property name="Height" cname="height" type="guint" doc-string=" _(The height of the layout.)" readable="true" writeable="true"/> <property name="Height" cname="height" type="guint" doc-string=" _(The height of the layout.)" readable="true" writeable="true"/>
<signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST"> <signal name="ScrollAdjustmentsSet" cname="set_scroll_adjustments" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GtkLayout*" name="layout"/> <parameter type="GtkLayout*" name="layout"/>
@ -11764,7 +11763,7 @@
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GtkTreeIter*" name="iter"/> <parameter type="GtkTreeIter*" name="iter"/>
<parameter type="G"/> <parameter type="G" name=""/>
</parameters> </parameters>
</method> </method>
<method name="InsertBefore" cname="gtk_list_store_insert_before"> <method name="InsertBefore" cname="gtk_list_store_insert_before">
@ -11777,7 +11776,7 @@
<constructor cname="gtk_list_store_new"> <constructor cname="gtk_list_store_new">
<parameters> <parameters>
<parameter type="gint" name="n_columns"/> <parameter type="gint" name="n_columns"/>
<parameter type=" "/> <parameter type=" " name=""/>
</parameters> </parameters>
</constructor> </constructor>
<method name="SetValist" cname="gtk_list_store_set_valist"> <method name="SetValist" cname="gtk_list_store_set_valist">
@ -12450,7 +12449,7 @@
</object> </object>
<object name="Object" cname="GtkObject" parent="GObject"> <object name="Object" cname="GtkObject" parent="GObject">
<field cname="flags" type="guint32"/> <field cname="flags" type="guint32"/>
<property name="UserData" cname="user_data" type="gpointer" doc-string=" Anonymous User Data Pointer" readable="true" writeable="true"/> <property name="UserData" cname="user_data" type="gpointer" doc-string="Anonymous User Data Pointer" readable="true" writeable="true"/>
<signal name="Destroyed" cname="destroy" when="CLEANUP"> <signal name="Destroyed" cname="destroy" when="CLEANUP">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -12467,7 +12466,7 @@
<parameters> <parameters>
<parameter type="GtkType" name="type"/> <parameter type="GtkType" name="type"/>
<parameter type="const-gchar*" name="first_property_name"/> <parameter type="const-gchar*" name="first_property_name"/>
<parameter type="c"/> <parameter type="c" name=""/>
</parameters> </parameters>
</constructor> </constructor>
</object> </object>
@ -13968,7 +13967,7 @@
<parameter type="const-gchar*" name="text"/> <parameter type="const-gchar*" name="text"/>
<parameter type="gint" name="len"/> <parameter type="gint" name="len"/>
<parameter type="GtkTextTag*" name="first_tag"/> <parameter type="GtkTextTag*" name="first_tag"/>
<parameter type="G"/> <parameter type="G" name=""/>
</parameters> </parameters>
</method> </method>
<method name="GetSlice" cname="gtk_text_buffer_get_slice"> <method name="GetSlice" cname="gtk_text_buffer_get_slice">
@ -14024,7 +14023,7 @@
<parameters> <parameters>
<parameter type="const-gchar*" name="tag_name"/> <parameter type="const-gchar*" name="tag_name"/>
<parameter type="const-gchar*" name="first_property_name"/> <parameter type="const-gchar*" name="first_property_name"/>
<parameter type="c"/> <parameter type="c" name=""/>
</parameters> </parameters>
</method> </method>
<method name="GetText" cname="gtk_text_buffer_get_text"> <method name="GetText" cname="gtk_text_buffer_get_text">
@ -14086,7 +14085,7 @@
<parameter type="const-gchar*" name="text"/> <parameter type="const-gchar*" name="text"/>
<parameter type="gint" name="len"/> <parameter type="gint" name="len"/>
<parameter type="const-gchar*" name="first_tag_name"/> <parameter type="const-gchar*" name="first_tag_name"/>
<parameter type="c"/> <parameter type="c" name=""/>
</parameters> </parameters>
</method> </method>
<method name="GetLineCount" cname="gtk_text_buffer_get_line_count"> <method name="GetLineCount" cname="gtk_text_buffer_get_line_count">
@ -14432,7 +14431,7 @@
<parameter type="GtkDirectionType" name="direction"/> <parameter type="GtkDirectionType" name="direction"/>
</parameters> </parameters>
</signal> </signal>
<signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST"> <signal name="ScrollAdjustmentsSet" cname="set_scroll_adjustments" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GtkTextView*" name="text_view"/> <parameter type="GtkTextView*" name="text_view"/>
@ -15217,7 +15216,7 @@
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GtkTreeIter*" name="iter"/> <parameter type="GtkTreeIter*" name="iter"/>
<parameter type="G"/> <parameter type="G" name=""/>
</parameters> </parameters>
</method> </method>
<method name="SetColumnTypes" cname="gtk_tree_store_set_column_types"> <method name="SetColumnTypes" cname="gtk_tree_store_set_column_types">
@ -15250,7 +15249,7 @@
<constructor cname="gtk_tree_store_new"> <constructor cname="gtk_tree_store_new">
<parameters> <parameters>
<parameter type="gint" name="n_columns"/> <parameter type="gint" name="n_columns"/>
<parameter type=" "/> <parameter type=" " name=""/>
</parameters> </parameters>
</constructor> </constructor>
<method name="Remove" cname="gtk_tree_store_remove"> <method name="Remove" cname="gtk_tree_store_remove">
@ -15324,7 +15323,7 @@
<property name="RulesHint" cname="rules_hint" type="gboolean" doc-string=" _(Set a hint to the theme engine to draw rows in alternating colors)" readable="true" writeable="true"/> <property name="RulesHint" cname="rules_hint" type="gboolean" doc-string=" _(Set a hint to the theme engine to draw rows in alternating colors)" readable="true" writeable="true"/>
<property name="EnableSearch" cname="enable_search" type="gboolean" doc-string=" _(View allows user to search through columns interactively)" readable="true" writeable="true"/> <property name="EnableSearch" cname="enable_search" type="gboolean" doc-string=" _(View allows user to search through columns interactively)" readable="true" writeable="true"/>
<property name="SearchColumn" cname="search_column" type="gint" doc-string=" _(Model column to search through when searching through code)" readable="true" writeable="true"/> <property name="SearchColumn" cname="search_column" type="gint" doc-string=" _(Model column to search through when searching through code)" readable="true" writeable="true"/>
<signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST"> <signal name="ScrollAdjustmentsSet" cname="set_scroll_adjustments" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GtkTreeView*" name="tree_view"/> <parameter type="GtkTreeView*" name="tree_view"/>
@ -15637,7 +15636,7 @@
<parameter type="gint" name="position"/> <parameter type="gint" name="position"/>
<parameter type="const-gchar*" name="title"/> <parameter type="const-gchar*" name="title"/>
<parameter type="GtkCellRenderer*" name="cell"/> <parameter type="GtkCellRenderer*" name="cell"/>
<parameter type="G"/> <parameter type="G" name=""/>
</parameters> </parameters>
</method> </method>
<method name="SetEnableSearch" cname="gtk_tree_view_set_enable_search"> <method name="SetEnableSearch" cname="gtk_tree_view_set_enable_search">
@ -16009,7 +16008,7 @@
<parameters> <parameters>
<parameter type="const-gchar*" name="title"/> <parameter type="const-gchar*" name="title"/>
<parameter type="GtkCellRenderer*" name="cell"/> <parameter type="GtkCellRenderer*" name="cell"/>
<parameter type="G"/> <parameter type="G" name=""/>
</parameters> </parameters>
</constructor> </constructor>
<method name="SetMaxWidth" cname="gtk_tree_view_column_set_max_width"> <method name="SetMaxWidth" cname="gtk_tree_view_column_set_max_width">
@ -16031,7 +16030,7 @@
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GtkCellRenderer*" name="cell_renderer"/> <parameter type="GtkCellRenderer*" name="cell_renderer"/>
<parameter type="G"/> <parameter type="G" name=""/>
</parameters> </parameters>
</method> </method>
<method name="GetAlignment" cname="gtk_tree_view_column_get_alignment"> <method name="GetAlignment" cname="gtk_tree_view_column_get_alignment">
@ -16094,7 +16093,7 @@
<property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" doc-string=" _(The GtkAdjustment that determines the values of the horizontal position for this viewport.)" readable="true" writeable="true"/> <property name="Hadjustment" cname="hadjustment" type="GtkAdjustment" doc-string=" _(The GtkAdjustment that determines the values of the horizontal position for this viewport.)" readable="true" writeable="true"/>
<property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" doc-string=" _(The GtkAdjustment that determines the values of the vertical position for this viewport.)" readable="true" writeable="true"/> <property name="Vadjustment" cname="vadjustment" type="GtkAdjustment" doc-string=" _(The GtkAdjustment that determines the values of the vertical position for this viewport.)" readable="true" writeable="true"/>
<property name="ShadowType" cname="shadow_type" type="GtkShadowType" doc-string=" _(Determines how the shadowed box around the viewport is drawn.)" readable="true" writeable="true"/> <property name="ShadowType" cname="shadow_type" type="GtkShadowType" doc-string=" _(Determines how the shadowed box around the viewport is drawn.)" readable="true" writeable="true"/>
<signal name="SetScrollAdjustments" cname="set_scroll_adjustments" when="LAST"> <signal name="ScrollAdjustmentsSet" cname="set_scroll_adjustments" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GtkViewport*" name="viewport"/> <parameter type="GtkViewport*" name="viewport"/>
@ -16304,7 +16303,7 @@
<parameter type="GtkWidget*" name="widget"/> <parameter type="GtkWidget*" name="widget"/>
</parameters> </parameters>
</signal> </signal>
<signal name="Focus" cname="focus" when="LAST"> <signal name="Focused" cname="focus" when="LAST">
<return-type type="gboolean"/> <return-type type="gboolean"/>
<parameters> <parameters>
<parameter type="GtkWidget*" name="widget"/> <parameter type="GtkWidget*" name="widget"/>
@ -16608,7 +16607,7 @@
</parameters> </parameters>
</signal> </signal>
<signal name="AccelClosuresChanged" cname="accel_closures_changed"> <signal name="AccelClosuresChanged" cname="accel_closures_changed">
<return-type/> <return-type type=""/>
</signal> </signal>
<implements> <implements>
<interface cname="AtkImplementor"/> <interface cname="AtkImplementor"/>
@ -16726,7 +16725,7 @@
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="const-gchar*" name="first_property_name"/> <parameter type="const-gchar*" name="first_property_name"/>
<parameter type="c"/> <parameter type="c" name=""/>
</parameters> </parameters>
</method> </method>
<method name="Ref" cname="gtk_widget_ref"> <method name="Ref" cname="gtk_widget_ref">
@ -16824,7 +16823,7 @@
<method name="GetExtensionEvents" cname="gtk_widget_get_extension_events"> <method name="GetExtensionEvents" cname="gtk_widget_get_extension_events">
<return-type type="GdkExtensionMode"/> <return-type type="GdkExtensionMode"/>
</method> </method>
<method name="Destroyed" cname="gtk_widget_destroyed"> <method name="Destroyed" cname="gtk_widget_destroyed" hidden="1">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GtkWidget**" name="widget_pointer"/> <parameter type="GtkWidget**" name="widget_pointer"/>
@ -17098,7 +17097,7 @@
<parameters> <parameters>
<parameter type="GtkType" name="type"/> <parameter type="GtkType" name="type"/>
<parameter type="const-gchar*" name="first_property_name"/> <parameter type="const-gchar*" name="first_property_name"/>
<parameter type="c"/> <parameter type="c" name=""/>
</parameters> </parameters>
</constructor> </constructor>
</object> </object>
@ -17737,14 +17736,12 @@
</method> </method>
</boxed> </boxed>
<boxed name="IconSource" cname="GtkIconSource"> <boxed name="IconSource" cname="GtkIconSource">
<field cname="the pixbuf is assumed to be the already-loaded contents of the* file.*/gchar* filename" type="*"/> <field cname="filename" type="gchar*"/>
<field cname="pixbuf" type="GdkPixbuf*"/> <field cname="pixbuf" type="GdkPixbuf*"/>
<field cname="direction" type="GtkTextDirection"/> <field cname="direction" type="GtkTextDirection"/>
<field cname="state" type="GtkStateType"/> <field cname="state" type="GtkStateType"/>
<field cname="size" type="GtkIconSize"/> <field cname="size" type="GtkIconSize"/>
<field cname="fields should be ignored. If FALSE" type="*"/> <field cname="any_direction" bits="1" type="guint"/>
<field cname="the parameter is* specified" type="*"/>
<field cname="any_direction" bits="1" type="*"/>
<field cname="any_state" bits="1" type="guint"/> <field cname="any_state" bits="1" type="guint"/>
<field cname="any_size" bits="1" type="guint"/> <field cname="any_size" bits="1" type="guint"/>
<method name="SetDirectionWildcarded" cname="gtk_icon_source_set_direction_wildcarded"> <method name="SetDirectionWildcarded" cname="gtk_icon_source_set_direction_wildcarded">
@ -17906,7 +17903,7 @@
<field cname="stepper_b" type="GdkRectangle"/> <field cname="stepper_b" type="GdkRectangle"/>
<field cname="stepper_c" type="GdkRectangle"/> <field cname="stepper_c" type="GdkRectangle"/>
<field cname="stepper_d" type="GdkRectangle"/> <field cname="stepper_d" type="GdkRectangle"/>
<field cname="entire range_rect*/GdkRectangle trough" type="*"/> <field cname="trough" type="GdkRectangle"/>
<field cname="slider" type="GdkRectangle"/> <field cname="slider" type="GdkRectangle"/>
<field cname="mouse_location" type="MouseLocation"/> <field cname="mouse_location" type="MouseLocation"/>
<field cname="mouse_x" type="gint"/> <field cname="mouse_x" type="gint"/>
@ -18164,12 +18161,11 @@
<field cname="views" type="BTreeView*"/> <field cname="views" type="BTreeView*"/>
<field cname="tag_infos" type="GSList*"/> <field cname="tag_infos" type="GSList*"/>
<field cname="tag_changed_handler" type="guint"/> <field cname="tag_changed_handler" type="guint"/>
<field cname="is added to or removed from the tree (i.e. the* length of a line may have changed" type="*"/> <field cname="chars_changed_stamp" type="guint"/>
<field cname="and lines may* have been added or removed). This invalidates* all outstanding iterators.*/guint chars_changed_stamp" type="*"/> <field cname="segments_changed_stamp" type="guint"/>
<field cname="this makes outstanding iterators recalculate their* pointed-to segment and segment offset.*/guint segments_changed_stamp" type="*"/>
<field cname="last_line" type="GtkTextLine*"/> <field cname="last_line" type="GtkTextLine*"/>
<field cname="last_line_stamp" type="guint"/> <field cname="last_line_stamp" type="guint"/>
<field cname="containing the end iterator*/GtkTextLine* end_iter_line" type="*"/> <field cname="end_iter_line" type="GtkTextLine*"/>
<field cname="end_iter_segment" type="GtkTextLineSegment*"/> <field cname="end_iter_segment" type="GtkTextLineSegment*"/>
<field cname="end_iter_segment_byte_index" type="int"/> <field cname="end_iter_segment_byte_index" type="int"/>
<field cname="end_iter_segment_char_offset" type="int"/> <field cname="end_iter_segment_char_offset" type="int"/>
@ -18832,18 +18828,18 @@
<field cname="shape_mask" type="GdkBitmap*"/> <field cname="shape_mask" type="GdkBitmap*"/>
</struct> </struct>
<struct name="WindowGeometryInfo" cname="GtkWindowGeometryInfo"> <struct name="WindowGeometryInfo" cname="GtkWindowGeometryInfo">
<field cname="geometry" type="*/GdkGeometry"/> <field cname="geometry" type="GdkGeometry"/>
<field cname="mask" type="GdkWindowHints"/> <field cname="mask" type="GdkWindowHints"/>
<field cname="widget" type="GtkWidget*"/> <field cname="widget" type="GtkWidget*"/>
<field cname="we should resize to this size.*/gint resize_width" type="*"/> <field cname="resize_width" type="gint"/>
<field cname="resize_height" type="gint"/> <field cname="resize_height" type="gint"/>
<field cname="only used if initial_pos_set*/gint initial_x" type="*"/> <field cname="initial_x" type="gint"/>
<field cname="initial_y" type="gint"/> <field cname="initial_y" type="gint"/>
<field cname="only if &gt; 0.*/gint default_width" type="*"/> <field cname="default_width" type="gint"/>
<field cname="default_height" type="gint"/> <field cname="default_height" type="gint"/>
<field cname="initial_pos_set" bits="1" type="guint"/> <field cname="initial_pos_set" bits="1" type="guint"/>
<field cname="position_constraints_changed" bits="1" type="*"/> <field cname="position_constraints_changed" bits="1" type="guint"/>
<field cname="default_is_geometry" bits="1" type="*"/> <field cname="default_is_geometry" bits="1" type="guint"/>
<field cname="last" type="GtkWindowLastGeometryInfo"/> <field cname="last" type="GtkWindowLastGeometryInfo"/>
</struct> </struct>
<object name="Stock" cname="GtkStock"> <object name="Stock" cname="GtkStock">
@ -19865,19 +19861,19 @@
<field cname="role" type="AtkRole"/> <field cname="role" type="AtkRole"/>
<field cname="relation_set" type="AtkRelationSet*"/> <field cname="relation_set" type="AtkRelationSet*"/>
<field cname="layer" type="AtkLayer"/> <field cname="layer" type="AtkLayer"/>
<property name="AtkObjectNamePropertyName" cname="atk_object_name_property_name" type="gchar*" doc-string=" Object instance\'s name formatted for assistive technology access" readable="true" writeable="true"/> <property name="AtkObjectNamePropertyName" cname="atk_object_name_property_name" type="gchar*" doc-string="Object instance\'s name formatted forassistive technology access" readable="true" writeable="true"/>
<property name="AtkObjectNamePropertyDescription" cname="atk_object_name_property_description" type="gchar*" doc-string=" Description of an object, formatted for assistive technology access" readable="true" writeable="true"/> <property name="AtkObjectNamePropertyDescription" cname="atk_object_name_property_description" type="gchar*" doc-string="Description of an object, formatted forassistive technology access" readable="true" writeable="true"/>
<property name="AtkObjectNamePropertyParent" cname="atk_object_name_property_parent" type="AtkObject" doc-string=" Is used to notify that the parent has changed " readable="true" writeable="true"/> <property name="AtkObjectNamePropertyParent" cname="atk_object_name_property_parent" type="AtkObject" doc-string="Is used to notify that the parent has changed" readable="true" writeable="true"/>
<property name="AtkObjectNamePropertyValue" cname="atk_object_name_property_value" type="gdouble" doc-string=" Is used to notify that the value has changed " readable="true" writeable="true"/> <property name="AtkObjectNamePropertyValue" cname="atk_object_name_property_value" type="gdouble" doc-string="Is used to notify that the value has changed" readable="true" writeable="true"/>
<property name="AtkObjectNamePropertyRole" cname="atk_object_name_property_role" type="gint" doc-string=" The accessible role of this object " readable="true" writeable="true"/> <property name="AtkObjectNamePropertyRole" cname="atk_object_name_property_role" type="gint" doc-string="The accessible role of this object" readable="true" writeable="true"/>
<property name="AtkObjectNamePropertyComponentLayer" cname="atk_object_name_property_component_layer" type="gint" doc-string=" The accessible layer of this object " readable="true"/> <property name="AtkObjectNamePropertyComponentLayer" cname="atk_object_name_property_component_layer" type="gint" doc-string="The accessible layer of this object" readable="true"/>
<property name="AtkObjectNamePropertyComponentMdiZorder" cname="atk_object_name_property_component_mdi_zorder" type="gint" doc-string=" The accessible MDI value of this object " readable="true"/> <property name="AtkObjectNamePropertyComponentMdiZorder" cname="atk_object_name_property_component_mdi_zorder" type="gint" doc-string="The accessible MDI value of this object" readable="true"/>
<property name="AtkObjectNamePropertyTableCaption" cname="atk_object_name_property_table_caption" type="gchar*" doc-string=" Is used to notify that the table caption has changed " readable="true" writeable="true"/> <property name="AtkObjectNamePropertyTableCaption" cname="atk_object_name_property_table_caption" type="gchar*" doc-string="Is used to notify that the table caption has changed" readable="true" writeable="true"/>
<property name="AtkObjectNamePropertyTableColumnHeader" cname="atk_object_name_property_table_column_header" type="AtkObject" doc-string=" Is used to notify that the table column header has changed " readable="true" writeable="true"/> <property name="AtkObjectNamePropertyTableColumnHeader" cname="atk_object_name_property_table_column_header" type="AtkObject" doc-string="Is used to notify that the table column header has changed" readable="true" writeable="true"/>
<property name="AtkObjectNamePropertyTableColumnDescription" cname="atk_object_name_property_table_column_description" type="gchar*" doc-string=" Is used to notify that the table columnscription has changed " readable="true" writeable="true"/> <property name="AtkObjectNamePropertyTableColumnDescription" cname="atk_object_name_property_table_column_description" type="gchar*" doc-string="Is used to notify that the table columnscription has changed" readable="true" writeable="true"/>
<property name="AtkObjectNamePropertyTableRowHeader" cname="atk_object_name_property_table_row_header" type="AtkObject" doc-string=" Is used to notify that the table row header has changed " readable="true" writeable="true"/> <property name="AtkObjectNamePropertyTableRowHeader" cname="atk_object_name_property_table_row_header" type="AtkObject" doc-string="Is used to notify that the table row header has changed" readable="true" writeable="true"/>
<property name="AtkObjectNamePropertyTableRowDescription" cname="atk_object_name_property_table_row_description" type="gchar*" doc-string=" Is used to notify that the table row description has changed " readable="true" writeable="true"/> <property name="AtkObjectNamePropertyTableRowDescription" cname="atk_object_name_property_table_row_description" type="gchar*" doc-string="Is used to notify that the table row description has changed" readable="true" writeable="true"/>
<property name="AtkObjectNamePropertyTableSummary" cname="atk_object_name_property_table_summary" type="AtkObject" doc-string=" Is used to notify that the table summary has changed " readable="true" writeable="true"/> <property name="AtkObjectNamePropertyTableSummary" cname="atk_object_name_property_table_summary" type="AtkObject" doc-string="Is used to notify that the table summary has changed" readable="true" writeable="true"/>
<signal name="ChildrenChanged" cname="children_changed" when="LAST"> <signal name="ChildrenChanged" cname="children_changed" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>

2
gtk/FileSelection.custom
View file

@ -108,7 +108,7 @@ public Gtk.HButtonBox ButtonArea {
[DllImport("gtksharpglue")] [DllImport("gtksharpglue")]
static extern IntPtr gtksharp_file_selection_get_action_area (IntPtr i); static extern IntPtr gtksharp_file_selection_get_action_area (IntPtr i);
public Gtk.HButtonBox ActionArea { public new Gtk.HButtonBox ActionArea {
get { return new Gtk.HButtonBox (gtksharp_file_selection_get_action_area (this.Handle)); } get { return new Gtk.HButtonBox (gtksharp_file_selection_get_action_area (this.Handle)); }
} }

28
parser/Gnome.metadata
View file

@ -134,6 +134,34 @@
</attribute> </attribute>
</data> </data>
</rule> </rule>
<rule>
<class name="GnomeFileEntry">
<signal>Activate</signal>
</class>
<data>
<attribute target="signal">
<name>name</name>
<value>Activated</value>
</attribute>
</data>
</rule>
<!-- hides -->
<rule>
<class name="GnomeFileEntry">
<method>GnomeEntry</method>
<method>GtkEntry</method>
</class>
<class name="GnomeIconEntry">
<method>PickDialog</method>
</class>
<data>
<attribute target="method">
<name>hidden</name>
<value>1</value>
</attribute>
</data>
</rule>
<!-- misc --> <!-- misc -->
<rule> <rule>

61
parser/Gtk.metadata
View file

@ -237,6 +237,17 @@
</attribute> </attribute>
</data> </data>
</rule> </rule>
<rule>
<class name="GtkWidget">
<signal>Focus</signal>
</class>
<data>
<attribute target="signal">
<name>name</name>
<value>Focused</value>
</attribute>
</data>
</rule>
<rule> <rule>
<class name="GtkWidget"> <class name="GtkWidget">
<signal>SizeAllocate</signal> <signal>SizeAllocate</signal>
@ -598,6 +609,15 @@
<class name="GtkMenuItem"> <class name="GtkMenuItem">
<signal>Activate</signal> <signal>Activate</signal>
</class> </class>
<class name="GtkButton">
<signal>Activate</signal>
</class>
<class name="GtkOldEditable">
<signal>Activate</signal>
</class>
<class name="GtkEntry">
<signal>Activate</signal>
</class>
<data> <data>
<attribute target="signal"> <attribute target="signal">
<name>name</name> <name>name</name>
@ -1068,6 +1088,32 @@
</attribute> </attribute>
</data> </data>
</rule> </rule>
<rule>
<class name="GtkCList">
<signal>SetScrollAdjustments</signal>
</class>
<class name="GtkLayout">
<signal>SetScrollAdjustments</signal>
</class>
<class name="GtkText">
<signal>SetScrollAdjustments</signal>
</class>
<class name="GtkTextView">
<signal>SetScrollAdjustments</signal>
</class>
<class name="GtkTreeView">
<signal>SetScrollAdjustments</signal>
</class>
<class name="GtkViewport">
<signal>SetScrollAdjustments</signal>
</class>
<data>
<attribute target="signal">
<name>name</name>
<value>ScrollAdjustmentsSet</value>
</attribute>
</data>
</rule>
<rule> <rule>
<class name="GtkHTML"> <class name="GtkHTML">
<signal>Command</signal> <signal>Command</signal>
@ -1079,6 +1125,21 @@
</attribute> </attribute>
</data> </data>
</rule> </rule>
<!-- hides -->
<rule>
<class name="GtkWidget">
<method>Destroyed</method>
</class>
<data>
<attribute target="method">
<name>hidden</name>
<value>1</value>
</attribute>
</data>
</rule>
<!-- overloads -->
<rule> <rule>
<class name="GtkBox"> <class name="GtkBox">
<method>PackStartDefaults</method> <method>PackStartDefaults</method>

8
parser/build.pl
View file

@ -9,10 +9,10 @@ unlink ($file);
"gtk+-2.0.3/gdk" => "Gdk:gdk-x11-2.0", "gtk+-2.0.3/gdk" => "Gdk:gdk-x11-2.0",
"gtk+-2.0.3/gdk-pixbuf" => "Gdk:gdk_pixbuf-2.0", "gtk+-2.0.3/gdk-pixbuf" => "Gdk:gdk_pixbuf-2.0",
"gtk+-2.0.3/gtk" => "Gtk:gtk-x11-2.0", "gtk+-2.0.3/gtk" => "Gtk:gtk-x11-2.0",
"libgnome-2.0.1/libgnome" => "Gnome:libgnome-2", "libgnome-2.0.1/libgnome" => "Gnome:gnome-2",
"libgnomecanvas-2.0.1/libgnomecanvas" => "Gnome:libgnomecanvas-2", "libgnomecanvas-2.0.1/libgnomecanvas" => "Gnome:gnomecanvas-2",
"libgnomeui-2.0.1/libgnomeui" => "Gnome:libgnomeui-2", "libgnomeui-2.0.1/libgnomeui" => "Gnome:gnomeui-2",
"gtkhtml/src" => "Gtk:libgtkhtml-3.0"); "gtkhtml/src" => "Gtk:gtkhtml-3.0");
foreach $dir (keys %srcs) { foreach $dir (keys %srcs) {
($ns, $lib) = split (/:/, $srcs{$dir}); ($ns, $lib) = split (/:/, $srcs{$dir});

7
parser/gapi2xml.pl
View file

@ -385,6 +385,9 @@ sub addFieldElems
next if ($field !~ /\S/); next if ($field !~ /\S/);
$field =~ s/\s+(\*+)/\1 /g; $field =~ s/\s+(\*+)/\1 /g;
$field =~ s/const /const\-/g; $field =~ s/const /const\-/g;
$field =~ s/.*\*\///g;
next if ($field !~ /\S/);
if ($field =~ /(\S+\s+\*?)\(\*\s*(.+)\)\s*\((.*)\)/) { if ($field =~ /(\S+\s+\*?)\(\*\s*(.+)\)\s*\((.*)\)/) {
$elem = addNameElem($parent, 'callback', $2); $elem = addNameElem($parent, 'callback', $2);
addReturnElem($elem, $1); addReturnElem($elem, $1);
@ -539,7 +542,7 @@ sub addPropElem
if ($defines{$name}) { if ($defines{$name}) {
$name = $defines{$name}; $name = $defines{$name};
} else { } else {
$name =~ s/\"//g; $name =~ s/\s*\"//g;
} }
while ($params[2] !~ /(\"|NULL)\s*\)?$/) { while ($params[2] !~ /(\"|NULL)\s*\)?$/) {
@ -548,7 +551,7 @@ sub addPropElem
@params = (@params[0..2],@params[4..$#params]); @params = (@params[0..2],@params[4..$#params]);
} }
$docs = $params[2]; $docs = $params[2];
$docs =~ s/\"//g; $docs =~ s/\s*\"//g;
$docs =~ s/\s+/ /g; $docs =~ s/\s+/ /g;
$mode = $params[$#params]; $mode = $params[$#params];

28
sources/Gnome.metadata
View file

@ -134,6 +134,34 @@
</attribute> </attribute>
</data> </data>
</rule> </rule>
<rule>
<class name="GnomeFileEntry">
<signal>Activate</signal>
</class>
<data>
<attribute target="signal">
<name>name</name>
<value>Activated</value>
</attribute>
</data>
</rule>
<!-- hides -->
<rule>
<class name="GnomeFileEntry">
<method>GnomeEntry</method>
<method>GtkEntry</method>
</class>
<class name="GnomeIconEntry">
<method>PickDialog</method>
</class>
<data>
<attribute target="method">
<name>hidden</name>
<value>1</value>
</attribute>
</data>
</rule>
<!-- misc --> <!-- misc -->
<rule> <rule>

61
sources/Gtk.metadata
View file

@ -237,6 +237,17 @@
</attribute> </attribute>
</data> </data>
</rule> </rule>
<rule>
<class name="GtkWidget">
<signal>Focus</signal>
</class>
<data>
<attribute target="signal">
<name>name</name>
<value>Focused</value>
</attribute>
</data>
</rule>
<rule> <rule>
<class name="GtkWidget"> <class name="GtkWidget">
<signal>SizeAllocate</signal> <signal>SizeAllocate</signal>
@ -598,6 +609,15 @@
<class name="GtkMenuItem"> <class name="GtkMenuItem">
<signal>Activate</signal> <signal>Activate</signal>
</class> </class>
<class name="GtkButton">
<signal>Activate</signal>
</class>
<class name="GtkOldEditable">
<signal>Activate</signal>
</class>
<class name="GtkEntry">
<signal>Activate</signal>
</class>
<data> <data>
<attribute target="signal"> <attribute target="signal">
<name>name</name> <name>name</name>
@ -1068,6 +1088,32 @@
</attribute> </attribute>
</data> </data>
</rule> </rule>
<rule>
<class name="GtkCList">
<signal>SetScrollAdjustments</signal>
</class>
<class name="GtkLayout">
<signal>SetScrollAdjustments</signal>
</class>
<class name="GtkText">
<signal>SetScrollAdjustments</signal>
</class>
<class name="GtkTextView">
<signal>SetScrollAdjustments</signal>
</class>
<class name="GtkTreeView">
<signal>SetScrollAdjustments</signal>
</class>
<class name="GtkViewport">
<signal>SetScrollAdjustments</signal>
</class>
<data>
<attribute target="signal">
<name>name</name>
<value>ScrollAdjustmentsSet</value>
</attribute>
</data>
</rule>
<rule> <rule>
<class name="GtkHTML"> <class name="GtkHTML">
<signal>Command</signal> <signal>Command</signal>
@ -1079,6 +1125,21 @@
</attribute> </attribute>
</data> </data>
</rule> </rule>
<!-- hides -->
<rule>
<class name="GtkWidget">
<method>Destroyed</method>
</class>
<data>
<attribute target="method">
<name>hidden</name>
<value>1</value>
</attribute>
</data>
</rule>
<!-- overloads -->
<rule> <rule>
<class name="GtkBox"> <class name="GtkBox">
<method>PackStartDefaults</method> <method>PackStartDefaults</method>