From bba2334f848c23f3ee7073541ff53b7077850cdb Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Thu, 12 Feb 2004 21:40:01 +0000 Subject: [PATCH] 2004-02-12 Mike Kestner * glade/Glade.metadata : hide a GList method. * glade/Makefile.in : run gapi-fixup * glade/XML.custom : return Widget[] from GetWidgetPrefix. * glade/glade-api.xml : regen * pango/Pango.metadata : hide a dubious GList method. * pango/pango-api.xml : regen svn path=/trunk/gtk-sharp/; revision=23043 --- ChangeLog | 9 ++ glade/Glade.metadata | 4 + glade/Makefile.in | 3 +- glade/XML.custom | 16 ++ glade/glade-api.xml | 357 +++++++++++++++++++++---------------------- pango/Pango.metadata | 1 + pango/pango-api.xml | 2 +- 7 files changed, 211 insertions(+), 181 deletions(-) create mode 100644 glade/Glade.metadata diff --git a/ChangeLog b/ChangeLog index 6c6d690f9..dfcb34730 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-02-12 Mike Kestner + + * glade/Glade.metadata : hide a GList method. + * glade/Makefile.in : run gapi-fixup + * glade/XML.custom : return Widget[] from GetWidgetPrefix. + * glade/glade-api.xml : regen + * pango/Pango.metadata : hide a dubious GList method. + * pango/pango-api.xml : regen + 2004-02-12 Ben Maurer * gtk/TreeIter.custom: Make the hash here not collide. diff --git a/glade/Glade.metadata b/glade/Glade.metadata new file mode 100644 index 000000000..cd43407fd --- /dev/null +++ b/glade/Glade.metadata @@ -0,0 +1,4 @@ + + + 1 + diff --git a/glade/Makefile.in b/glade/Makefile.in index 7c75e207c..4a50e0805 100755 --- a/glade/Makefile.in +++ b/glade/Makefile.in @@ -14,7 +14,8 @@ ASSEMBLY=glade-sharp.dll @ENABLE_GLADE_TRUE@ all: $(ASSEMBLY) @ENABLE_GLADE_FALSE@ all: -generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe +generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe ../parser/gapi-fixup.exe Glade.metadata + $(RUNTIME) ../parser/gapi-fixup.exe --api=glade-api.xml --metadata=Glade.metadata && \ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ --assembly-name=glade-sharp && touch generated-stamp diff --git a/glade/XML.custom b/glade/XML.custom index 8b15f3b15..a2271f971 100644 --- a/glade/XML.custom +++ b/glade/XML.custom @@ -320,3 +320,19 @@ return new Glade.XML ( System.Reflection.Assembly.GetCallingAssembly (), resource_name, root, domain); } + + [DllImport("libglade-2.0-0.dll")] + static extern IntPtr glade_xml_get_widget_prefix(IntPtr raw, string name); + + public Gtk.Widget[] GetWidgetPrefix(string name) + { + IntPtr raw_ret = glade_xml_get_widget_prefix(Handle, name); + if (raw_ret == IntPtr.Zero) + return new Gtk.Widget [0]; + GLib.List list = new GLib.List (raw_ret); + Gtk.Widget[] result = new Gtk.Widget [list.Count]; + int i = 0; + foreach (Gtk.Widget w in list) + result [i++] = w; + return result; + } diff --git a/glade/glade-api.xml b/glade/glade-api.xml index 42a253b56..d4cbad451 100644 --- a/glade/glade-api.xml +++ b/glade/glade-api.xml @@ -1,6 +1,5 @@ - - - + - - - - + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - - - - - + + + + + + + - + - - - - - - - - + + + + + + + + - - + + - + - + - + - - - + + + - + - + - + - + - - + - + - - + + - + - - - + + + - - - + + + - - - - + + + + - + - + - + - - + + - + - - - - + + + + - + - + - + - - - + + + - + - + - - + + - + - - + + - + - - - + + + - + - - - + + + - - - + + + - - + + - - + + - - - - + + + + - - - - - - + + + + + + - + - + - + - - + + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - + + - + - - + + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - + - - + + - + - - - + + + - + - - + + - + - - - + + + - + - - - + + + - + \ No newline at end of file diff --git a/pango/Pango.metadata b/pango/Pango.metadata index 3dc5210f4..ffbab10d8 100644 --- a/pango/Pango.metadata +++ b/pango/Pango.metadata @@ -1,5 +1,6 @@ + 1 Pango.LayoutLine out out diff --git a/pango/pango-api.xml b/pango/pango-api.xml index 3b44638f7..5e8d0e66f 100644 --- a/pango/pango-api.xml +++ b/pango/pango-api.xml @@ -1473,7 +1473,7 @@ - +