diff --git a/ChangeLog b/ChangeLog index a12d23724..8dd1c35a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2002-10-26 Mike Kestner + + * api/*.xml : get libgda and libgnomedb metadata setup + * gconf/*/Makefile.in : patch from MauricioC for -L's and /r's + * gnomedb/Makefile.in : patch from MauricioC for -L's and /r's + * generator/ClassBase.cs (ctor): mangle hash names for sigs and props + * generator/Parameters.cs (MangleName): handle params, null, and ref + * generator/Parser.cs (ParseNamespace): ignore "hidden" types + * generator/StructBase.cs (MangleName): handle params, null, and ref + * glib/Object.cs (Equals): kill, also kill == and != + * sources/Gda.metadata : new, make Gda behave without hand edits + * sources/GnomeDb.metadata : ditto + 2002-10-21 Vladimir Vukicevic * glade/XML.custom: add SetCustomHandler() wrapper diff --git a/api/.cvsignore b/api/.cvsignore new file mode 100755 index 000000000..5c364cb93 --- /dev/null +++ b/api/.cvsignore @@ -0,0 +1,7 @@ +*.dll +*.exe +*.xml +generated +generated-stamp +Makefile + diff --git a/api/art-api.xml b/api/art-api.xml index 8bbb0cf3a..fec37dc58 100644 --- a/api/art-api.xml +++ b/api/art-api.xml @@ -1,4 +1,4 @@ - + diff --git a/api/atk-api.xml b/api/atk-api.xml index dc256c654..c8b67d3d5 100644 --- a/api/atk-api.xml +++ b/api/atk-api.xml @@ -1,4 +1,4 @@ - + diff --git a/api/gda-api.xml b/api/gda-api.xml index b4a3b4bc9..244a78f99 100644 --- a/api/gda-api.xml +++ b/api/gda-api.xml @@ -201,21 +201,21 @@ - + - + - + @@ -243,7 +243,7 @@ - + @@ -294,19 +294,19 @@ - + - + - + @@ -432,6 +432,12 @@ + @@ -452,6 +458,12 @@ + + + + + + @@ -488,6 +500,12 @@ + + + + + + @@ -565,6 +583,89 @@ + @@ -635,7 +736,7 @@ - + @@ -649,7 +750,7 @@ - + @@ -668,7 +769,7 @@ - + @@ -1104,7 +1205,7 @@ - + @@ -1256,6 +1357,11 @@ + + + + + @@ -1365,7 +1471,7 @@ - + @@ -1682,7 +1788,7 @@ - + @@ -1707,7 +1813,7 @@ - + @@ -1764,7 +1870,7 @@ - + @@ -1960,7 +2066,7 @@ - + @@ -2014,7 +2120,7 @@ - + @@ -2026,7 +2132,7 @@ - + @@ -2044,7 +2150,7 @@ - + diff --git a/api/gdk-api.xml b/api/gdk-api.xml index 59e6d31d6..ed8df566c 100644 --- a/api/gdk-api.xml +++ b/api/gdk-api.xml @@ -1,4 +1,4 @@ - + diff --git a/api/glade-api.xml b/api/glade-api.xml index 3d195537f..1a0e93389 100644 --- a/api/glade-api.xml +++ b/api/glade-api.xml @@ -1,4 +1,4 @@ - + diff --git a/api/gnome-api.xml b/api/gnome-api.xml index 6708569dd..d1c4a7820 100644 --- a/api/gnome-api.xml +++ b/api/gnome-api.xml @@ -1,4 +1,4 @@ - + diff --git a/api/gnomedb-api.xml b/api/gnomedb-api.xml index 45d5dac21..5b49ed4b0 100644 --- a/api/gnomedb-api.xml +++ b/api/gnomedb-api.xml @@ -2,7 +2,7 @@ - + @@ -95,6 +95,66 @@ + @@ -566,6 +626,56 @@ + diff --git a/api/pango-api.xml b/api/pango-api.xml index 70a69eab3..94857bd72 100644 --- a/api/pango-api.xml +++ b/api/pango-api.xml @@ -1,4 +1,4 @@ - + diff --git a/gconf/GConf.PropertyEditors/Makefile.in b/gconf/GConf.PropertyEditors/Makefile.in index 8d80cae0f..45e75d5b0 100644 --- a/gconf/GConf.PropertyEditors/Makefile.in +++ b/gconf/GConf.PropertyEditors/Makefile.in @@ -18,7 +18,7 @@ SOURCES = \ all: gconf-sharp-peditors.dll gconf-sharp-peditors.dll: $(SOURCES) - $(MCS) $(SOURCES) /r:../GConf/gconf-sharp.dll /r:glib-sharp /r:gtk-sharp /r:gnome-sharp /r:glade-sharp /r:System.Drawing /target:library /out:gconf-sharp-peditors.dll + $(MCS) $(SOURCES) -L ../../glib -L ../../pango -L ../../atk -L ../../gdk -L ../../gtk -L ../../art -L ../../gnome -L ../GConf -L ../../glade /r:glib-sharp.dll /r:pango-sharp.dll /r:atk-sharp.dll /r:gdk-sharp.dll /r:gtk-sharp.dll /r:art-sharp.dll /r:gnome-sharp.dll /r:glade-sharp.dll /r:gconf-sharp.dll /r:System.Drawing /target:library /out:gconf-sharp-peditors.dll install: all cp gconf-sharp-peditors.dll $(DESTDIR)@prefix@/lib diff --git a/gconf/GConf/Makefile.in b/gconf/GConf/Makefile.in index dbeb37865..d09fd59ea 100644 --- a/gconf/GConf/Makefile.in +++ b/gconf/GConf/Makefile.in @@ -16,7 +16,7 @@ SOURCES = \ all: gconf-sharp.dll gconf-sharp.dll: $(SOURCES) - $(MCS) $(SOURCES) /r:glib-sharp.dll /target:library /out:gconf-sharp.dll + $(MCS) $(SOURCES) -L ../../glib /r:glib-sharp.dll /target:library /out:gconf-sharp.dll install: all cp gconf-sharp.dll $(DESTDIR)@prefix@/lib diff --git a/generator/ClassBase.cs b/generator/ClassBase.cs index 62df9fcff..7cf03f6ba 100644 --- a/generator/ClassBase.cs +++ b/generator/ClassBase.cs @@ -51,20 +51,27 @@ namespace GtkSharp.Generation { if (member.HasAttribute ("hidden")) continue; + string name; switch (node.Name) { case "method": - string name = member.GetAttribute("name"); + name = member.GetAttribute("name"); while (methods.ContainsKey(name)) name += "mangled"; methods.Add (name, new Method (LibraryName, member, this)); break; case "property": - props.Add (member.GetAttribute ("name"), new Property (member, this)); + name = member.GetAttribute("name"); + while (props.ContainsKey(name)) + name += "mangled"; + props.Add (name, new Property (member, this)); break; case "signal": - sigs.Add (member.GetAttribute ("name"), new Signal (member, this)); + name = member.GetAttribute("name"); + while (sigs.ContainsKey(name)) + name += "mangled"; + sigs.Add (name, new Signal (member, this)); break; case "implements": diff --git a/generator/Parameters.cs b/generator/Parameters.cs index 23bedc8d1..46380503d 100644 --- a/generator/Parameters.cs +++ b/generator/Parameters.cs @@ -478,8 +478,14 @@ namespace GtkSharp.Generation { return "str1ng"; case "event": return "evnt"; + case "null": + return "is_null"; case "object": return "objekt"; + case "params": + return "parms"; + case "ref": + return "reference"; case "in": return "in_param"; case "out": diff --git a/generator/Parser.cs b/generator/Parser.cs index db6804a73..8e90710d7 100644 --- a/generator/Parser.cs +++ b/generator/Parser.cs @@ -64,6 +64,9 @@ namespace GtkSharp.Generation { XmlElement elem = (XmlElement) def; IGeneratable igen = null; + if (elem.HasAttribute("hidden")) + continue; + switch (def.Name) { case "alias": diff --git a/generator/StructBase.cs b/generator/StructBase.cs index ea3bc894c..ee2c0404d 100644 --- a/generator/StructBase.cs +++ b/generator/StructBase.cs @@ -189,8 +189,14 @@ namespace GtkSharp.Generation { return "str1ng"; } else if (name == "event") { return "evnt"; + } else if (name == "null") { + return "is_null"; } else if (name == "object") { return "objekt"; + } else if (name == "ref") { + return "reference"; + } else if (name == "params") { + return "parms"; } else if (name == "in") { return "inn"; } else { diff --git a/glib/Object.cs b/glib/Object.cs index 7f17bf5e9..e40cb2038 100644 --- a/glib/Object.cs +++ b/glib/Object.cs @@ -200,58 +200,6 @@ namespace GLib { } } - /// - /// Equals Method - /// - /// - /// - /// Checks equivalence of two Objects. - /// - - public override bool Equals (object o) - { - if (!(o is Object)) - return false; - - return (Handle == ((Object) o).Handle); - } - - public static bool operator == (Object a, Object b) - { - object oa = a; - object ob = b; - - if (ob == null){ - if (oa == null) - return true; - else - return false; - } else { - if (oa == null) - return false; - else - return a.Equals (b); - } - } - - public static bool operator != (Object a, Object b) - { - object oa = a; - object ob = b; - - if (ob == null){ - if (oa == null) - return false; - else - return true; - } else { - if (oa == null) - return true; - else - return !a.Equals (b); - } - } - /// /// GetHashCode Method /// diff --git a/gnomedb/Makefile.in b/gnomedb/Makefile.in index 8ce16c10e..1de69b76a 100755 --- a/gnomedb/Makefile.in +++ b/gnomedb/Makefile.in @@ -5,12 +5,12 @@ DESTDIR= @ENABLE_GNOMEDB_FALSE@ all: windows: - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../gtk/gtk-sharp.dll /r:../gnome/gnome-sharp.dll /r:../gda/gda-sharp.dll /out:gnomedb-sharp.dll /recurse:*.cs + $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../art/art-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:../gnome/gnome-sharp.dll /r:../gda/gda-sharp.dll /out:gnomedb-sharp.dll /recurse:*.cs linux: gnomedb-sharp.dll gnomedb-sharp.dll: Application.cs generated/*.cs - $(MCS) --unsafe --target library -L ../glib -r glib-sharp.dll -r gtk-sharp.dll -r gnome-sharp.dll -r gda-sharp.dll -o gnomedb-sharp.dll --recurse '*.cs' + $(MCS) --unsafe --target library -L ../glib -L ../pango -L ../atk -L ../art -L ../gdk -L ../gtk -L ../gnome -L ../gda -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -r art-sharp.dll -r gdk-sharp.dll -r gtk-sharp.dll -r gnome-sharp.dll -r gda-sharp.dll -o gnomedb-sharp.dll --recurse '*.cs' clean: rm -f *.dll diff --git a/parser/.cvsignore b/parser/.cvsignore new file mode 100755 index 000000000..5e655fdc2 --- /dev/null +++ b/parser/.cvsignore @@ -0,0 +1,3 @@ +Makefile +gapi_format_xml + diff --git a/sample/gconf/Makefile b/sample/gconf/Makefile index 30c491b2e..213f268cf 100644 --- a/sample/gconf/Makefile +++ b/sample/gconf/Makefile @@ -9,7 +9,7 @@ GCONFDIR=../../gconf all: sample.exe sample.exe: sample.schema sample.glade $(SOURCES) - $(MCS) /out:sample.exe $(SOURCES) /r:$(GCONFDIR)/GConf/gconf-sharp.dll /r:$(GCONFDIR)/GConf.PropertyEditors/gconf-sharp-peditors.dll /r:gtk-sharp /r:glade-sharp /r:gnome-sharp /r:System.Drawing /resource:sample.glade + $(MCS) /out:sample.exe $(SOURCES) /r:../../glib/glib-sharp.dll /r:../../pango/pango-sharp.dll /r:../../atk/atk-sharp.dll /r:../../art/art-sharp.dll /r:../../gdk/gdk-sharp.dll /r:$(GCONFDIR)/GConf/gconf-sharp.dll /r:../../gtk/gtk-sharp.dll /r:../../gnome/gnome-sharp.dll /r:../../glade/glade-sharp.dll /r:$(GCONFDIR)/GConf.PropertyEditors/gconf-sharp-peditors.dll /r:System.Drawing /resource:sample.glade Settings.cs: sample.schema MONO_PATH=$(top_builddir)/gconf/GConf/gconf-sharp.dll mono $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample sample.schema > Settings.cs diff --git a/sources/Gda.metadata b/sources/Gda.metadata new file mode 100644 index 000000000..9fe6ada0c --- /dev/null +++ b/sources/Gda.metadata @@ -0,0 +1,82 @@ + + + + + + + Changed + + + + name + DataChanged + + + + + + BeginEdit + + + + name + BeginEditing + + + + + + CancelEdit + + + + name + CancelEditing + + + + + + EndEdit + + + + name + EndEditing + + + + + + Changed + + + + name + DataChanged + + + + + + ToXmlNode + + + + hidden + 1 + + + + + + + + + hidden + 1 + + + + + diff --git a/sources/GnomeDb.metadata b/sources/GnomeDb.metadata new file mode 100644 index 000000000..d32185296 --- /dev/null +++ b/sources/GnomeDb.metadata @@ -0,0 +1,26 @@ + + + + + + + + + + hidden + 1 + + + + + + + + + hidden + 1 + + + + + diff --git a/sources/README b/sources/README index 46eee61fe..ec1e97a26 100644 --- a/sources/README +++ b/sources/README @@ -17,3 +17,4 @@ gtkhtml: cvs branch gnome-2-port files gtkhtml.[ch], gtkhtml-types.h, libglade-2.0.0 libart_lgpl-2.3.10 libgda-0.8.193 +libgnomedb-0.8.193