diff --git a/ChangeLog b/ChangeLog index 4d536938d..e6988774d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-11-14 Mike Kestner + + * gtk/Gtk.metadata : fully qualify attr paths + * parser/gapi-fixup.cs : compile a path expression per Ben Maurer + suggestion. + 2003-11-14 Mike Kestner * configure.in : update VERSION to 0.14. Tagged 0.13. diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata index def6fbf7c..79a53c2c9 100644 --- a/gtk/Gtk.metadata +++ b/gtk/Gtk.metadata @@ -1,299 +1,299 @@ - 1 - 1 - 1 - 1 - 1 - out - 1 - out - 1 - 1 - ref - GdkModifierType - 1 - StockManager - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - FinishEditing - WidgetRemoved - GetIsEditable - ref - SetIsEditable - TextDeleted - TextInserted - out - out - out - out - out - out - out - EmitRowChanged - EmitRowDeleted - EmitRowHasChildToggled - EmitRowInserted - EmitRowsReordered - ChangeSortColumn - Change - ChangeValue - 1 - 1 - PackEnd - PackStart - 1 - Click - Press - Release - Activated - Entered - Left - SetDisplayOptions - 1 - 1 - Toggle - 1 - 1 - 1 - 1 - 1 - 1 - Added - ResizeChecked - Removed - FocusChildSet - 1 - Respond - Activated - ClipboardCopied - ClipboardCut - ClipboardPasted - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - SurroundingDeleted - 1 - 1 - GetItem - GetWidget - Deselected - Selected - Toggled - 1 - 1 - 1 - 1 - ScrollAdjustmentsSet - length_param - out - out - out - out - out - out - 1 - 1 - 1 - Activated - ChildNotified - Deactivated - MnemonicActivated - WidgetRemoved - SizeAllocated - SizeRequested - ToggleSizeAllocated - ToggleSizeRequested - 1 - 1 - 1 - Deactivated - 1 - Destroyed - 1 - 1 - 1 - GtkWidget - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - out - 1 - 1 - 1 - Attach - 1 - 1 - 1 - ApplyTag - DeleteMark - out - out - GetInsertMark - out - out - out - out - out - out - out - out - MoveMark - RemoveTag - TagApplied - UserActionBegun - UserActionEnded - ChildAnchorInserted - PixbufInserted - ChildAnchorRemoved - TagRemoved - out - ScrollAdjustmentsSet - ProcessEvent - PangoWeight - TextEvent - out - out - ScrollAdjustmentsSet - 1 - Toggle - 1 - out - out - out - length_param - out - out - out - out - out - out - 1 - Click - 1 - out - out - out - out - out - out - out - 1 - 1 - ActivateRow - RowExpand - 1 - 1 - 1 - ScrollAdjustmentsSet - 1 - 1 - 1 - 1 - ScrollAdjustmentsSet - 1 - 1 - out - 1 - ProcessEvent - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - out - GetIsFocus - 1 - out - 1 - 1 - 1 - ref - 1 - ChildNotified - WidgetEvent - Focused - FocusGrabbed - Hidden - Mapped - MnemonicActivated - Realized - HelpShown - Shown - SizeAllocated - SizeRequested - Unmapped - Unrealized - out - out - out - 1 - DefaultActivated - FocusActivated - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - GtkTargetFlags - 1 - 1 - 1 - 1 - //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'] + 1 + 1 + 1 + 1 + 1 + out + 1 + out + 1 + 1 + ref + GdkModifierType + 1 + StockManager + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + FinishEditing + WidgetRemoved + GetIsEditable + ref + SetIsEditable + TextDeleted + TextInserted + out + out + out + out + out + out + out + EmitRowChanged + EmitRowDeleted + EmitRowHasChildToggled + EmitRowInserted + EmitRowsReordered + ChangeSortColumn + Change + ChangeValue + 1 + 1 + PackEnd + PackStart + 1 + Click + Press + Release + Activated + Entered + Left + SetDisplayOptions + 1 + 1 + Toggle + 1 + 1 + 1 + 1 + 1 + 1 + Added + ResizeChecked + Removed + FocusChildSet + 1 + Respond + Activated + ClipboardCopied + ClipboardCut + ClipboardPasted + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + SurroundingDeleted + 1 + 1 + GetItem + GetWidget + Deselected + Selected + Toggled + 1 + 1 + 1 + 1 + ScrollAdjustmentsSet + length_param + out + out + out + out + out + out + 1 + 1 + 1 + Activated + ChildNotified + Deactivated + MnemonicActivated + WidgetRemoved + SizeAllocated + SizeRequested + ToggleSizeAllocated + ToggleSizeRequested + 1 + 1 + 1 + Deactivated + 1 + Destroyed + 1 + 1 + 1 + GtkWidget + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + out + 1 + 1 + 1 + Attach + 1 + 1 + 1 + ApplyTag + DeleteMark + out + out + GetInsertMark + out + out + out + out + out + out + out + out + MoveMark + RemoveTag + TagApplied + UserActionBegun + UserActionEnded + ChildAnchorInserted + PixbufInserted + ChildAnchorRemoved + TagRemoved + out + ScrollAdjustmentsSet + ProcessEvent + PangoWeight + TextEvent + out + out + ScrollAdjustmentsSet + 1 + Toggle + 1 + out + out + out + length_param + out + out + out + out + out + out + 1 + Click + 1 + out + out + out + out + out + out + out + 1 + 1 + ActivateRow + RowExpand + 1 + 1 + 1 + ScrollAdjustmentsSet + 1 + 1 + 1 + 1 + ScrollAdjustmentsSet + 1 + 1 + out + 1 + ProcessEvent + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + out + GetIsFocus + 1 + out + 1 + 1 + 1 + ref + 1 + ChildNotified + WidgetEvent + Focused + FocusGrabbed + Hidden + Mapped + MnemonicActivated + Realized + HelpShown + Shown + SizeAllocated + SizeRequested + Unmapped + Unrealized + out + out + out + 1 + DefaultActivated + FocusActivated + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + GtkTargetFlags + 1 + 1 + 1 + 1 + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] + /api/namespace/object[@cname='GtkStyle'] diff --git a/parser/gapi-fixup.cs b/parser/gapi-fixup.cs index 790a1304e..5c2a67e4a 100644 --- a/parser/gapi-fixup.cs +++ b/parser/gapi-fixup.cs @@ -63,7 +63,7 @@ namespace GtkSharp.Parsing { XPathNavigator meta_nav = meta_doc.CreateNavigator (); XPathNavigator api_nav = api_doc.CreateNavigator (); - XPathNodeIterator attr_iter = meta_nav.Select ("//attr"); + XPathNodeIterator attr_iter = meta_nav.Select ("/metadata/attr"); while (attr_iter.MoveNext ()) { string path = attr_iter.Current.GetAttribute ("path", ""); string attr_name = attr_iter.Current.GetAttribute ("name", ""); @@ -74,14 +74,15 @@ namespace GtkSharp.Parsing { } } - XPathNodeIterator move_iter = meta_nav.Select ("//move-node"); + XPathNodeIterator move_iter = meta_nav.Select ("/metadata/move-node"); while (move_iter.MoveNext ()) { string path = move_iter.Current.GetAttribute ("path", ""); + XPathExpression expr = api_nav.Compile (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); + XPathNodeIterator path_iter = parent_iter.Current.Clone ().Select (expr); while (path_iter.MoveNext ()) { XmlNode node = ((IHasXmlNode)path_iter.Current).GetNode (); parent_node.AppendChild (node.Clone ());