From ff35a19db0877327ba8ab2900b01919e2198c1e7 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Sun, 19 Oct 2003 01:35:24 +0000 Subject: [PATCH] 2003-10-18 Mike Kestner * gtk/Gtk.metadata : add move-node rules for Paint methods. * gtk/gtk-api.xml : regenerated * parser/gapi2xml.pl : put paint_ methods in global, not Paint. * parser/gapi-fixup.cs : add move-node rule handling. [Fixes #47980] svn path=/trunk/gtk-sharp/; revision=19184 --- ChangeLog | 7 + gtk/Gtk.metadata | 20 ++ gtk/gtk-api.xml | 646 +++++++++++++++++++++---------------------- parser/gapi-fixup.cs | 16 ++ parser/gapi2xml.pl | 3 +- 5 files changed, 367 insertions(+), 325 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c7e5b715..8eaf1b79f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-10-18 Mike Kestner + + * gtk/Gtk.metadata : add move-node rules for Paint methods. + * gtk/gtk-api.xml : regenerated + * parser/gapi2xml.pl : put paint_ methods in global, not Paint. + * parser/gapi-fixup.cs : add move-node rule handling. [Fixes #47980] + 2003-10-17 Mike Kestner * generator/Parameters.cs : mark enum pointer params as out. diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata index 30084e3e3..42588ac96 100644 --- a/gtk/Gtk.metadata +++ b/gtk/Gtk.metadata @@ -62,5 +62,25 @@ out out ref + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] + //object[@cname='GtkStyle'] diff --git a/gtk/gtk-api.xml b/gtk/gtk-api.xml index ee7cf41ba..c56f23a92 100644 --- a/gtk/gtk-api.xml +++ b/gtk/gtk-api.xml @@ -6301,6 +6301,328 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12587,330 +12909,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/parser/gapi-fixup.cs b/parser/gapi-fixup.cs index 4564f4d0e..790a1304e 100644 --- a/parser/gapi-fixup.cs +++ b/parser/gapi-fixup.cs @@ -74,6 +74,22 @@ namespace GtkSharp.Parsing { } } + XPathNodeIterator move_iter = meta_nav.Select ("//move-node"); + while (move_iter.MoveNext ()) { + string path = move_iter.Current.GetAttribute ("path", ""); + string parent = move_iter.Current.Value; + XPathNodeIterator parent_iter = api_nav.Select (parent); + while (parent_iter.MoveNext ()) { + XmlNode parent_node = ((IHasXmlNode)parent_iter.Current).GetNode (); + XPathNodeIterator path_iter = parent_iter.Current.Clone ().Select (path); + while (path_iter.MoveNext ()) { + XmlNode node = ((IHasXmlNode)path_iter.Current).GetNode (); + parent_node.AppendChild (node.Clone ()); + node.ParentNode.RemoveChild (node); + } + } + } + api_doc.Save (api_filename); return 0; } diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl index fb11d55bf..470feb96f 100755 --- a/parser/gapi2xml.pl +++ b/parser/gapi2xml.pl @@ -577,7 +577,8 @@ sub addStaticFuncElems $classname ne "add" && $classname ne "remove" && $classname ne "free" && $classname ne "register" && $classname ne "execute" && $classname ne "show" && - $classname ne "parse" && $classname ne "string") { + $classname ne "parse" && $classname ne "paint" && + $classname ne "string") { while ($mnames[$i+$cnt] =~ /$prefix/) { $cnt++; } } if ($cnt == 1) {