diff --git a/doc/ChangeLog b/doc/ChangeLog index ec9bdf1dd..90ffe62a4 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,10 @@ +2005-02-15 Dan Winship + + * updater/updater.cs (Compare): handle BaseType changes + (Generate, AddTypeSignature): fix spelling of "delegate" + + * en/*: regenerate to update BaseType nodes + 2005-02-11 Dan Winship * en/Gtk/Widget.xml (StyleGetValist, StyleGetProperty): update diff --git a/doc/en/GLib/Value.xml b/doc/en/GLib/Value.xml index 5a8649a76..01c36bb38 100644 --- a/doc/en/GLib/Value.xml +++ b/doc/en/GLib/Value.xml @@ -15,7 +15,7 @@ - System.Object + System.ValueType @@ -353,4 +353,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gda/Command.xml b/doc/en/Gda/Command.xml index 48ac5803e..e2ad9247f 100644 --- a/doc/en/Gda/Command.xml +++ b/doc/en/Gda/Command.xml @@ -22,7 +22,7 @@ One interesting thing about Gda.Command's is that they can be reused over and ov - System.ValueType + GLib.Opaque diff --git a/doc/en/Gda/FieldAttributes.xml b/doc/en/Gda/FieldAttributes.xml index 7d44f69cb..35b8193e5 100644 --- a/doc/en/Gda/FieldAttributes.xml +++ b/doc/en/Gda/FieldAttributes.xml @@ -14,7 +14,7 @@ To be added - System.ValueType + GLib.Opaque diff --git a/doc/en/Gda/Parameter.xml b/doc/en/Gda/Parameter.xml index 7ead59071..dc4b83339 100644 --- a/doc/en/Gda/Parameter.xml +++ b/doc/en/Gda/Parameter.xml @@ -18,7 +18,7 @@ Management of parameters. Parameters are the way clients have to send an unlimi To be added - System.ValueType + GLib.Opaque diff --git a/doc/en/Gdk/Cursor.xml b/doc/en/Gdk/Cursor.xml index 0e766dfe4..e2aeb5d3f 100644 --- a/doc/en/Gdk/Cursor.xml +++ b/doc/en/Gdk/Cursor.xml @@ -14,7 +14,7 @@ The represents cursors. - System.ValueType + GLib.Opaque diff --git a/doc/en/Gdk/Event.xml b/doc/en/Gdk/Event.xml index 87da6f995..31e43bdf0 100644 --- a/doc/en/Gdk/Event.xml +++ b/doc/en/Gdk/Event.xml @@ -14,7 +14,7 @@ This class is equivalent to the GdkEventAny structure in the C API. - GLib.Boxed + System.Object diff --git a/doc/en/Gdk/EventButton.xml b/doc/en/Gdk/EventButton.xml index d04b8ffc8..60cecc02b 100644 --- a/doc/en/Gdk/EventButton.xml +++ b/doc/en/Gdk/EventButton.xml @@ -107,7 +107,7 @@ - System.ValueType + Gdk.Event diff --git a/doc/en/Gdk/EventClient.xml b/doc/en/Gdk/EventClient.xml index 61b96567d..acdc21465 100644 --- a/doc/en/Gdk/EventClient.xml +++ b/doc/en/Gdk/EventClient.xml @@ -15,7 +15,7 @@ - System.ValueType + Gdk.Event diff --git a/doc/en/Gdk/EventConfigure.xml b/doc/en/Gdk/EventConfigure.xml index 0439759e4..f481656d5 100644 --- a/doc/en/Gdk/EventConfigure.xml +++ b/doc/en/Gdk/EventConfigure.xml @@ -15,7 +15,7 @@ - System.ValueType + Gdk.Event diff --git a/doc/en/Gdk/EventCrossing.xml b/doc/en/Gdk/EventCrossing.xml index 2d554b66a..3c78c2c28 100644 --- a/doc/en/Gdk/EventCrossing.xml +++ b/doc/en/Gdk/EventCrossing.xml @@ -15,7 +15,7 @@ - System.ValueType + Gdk.Event diff --git a/doc/en/Gdk/EventDND.xml b/doc/en/Gdk/EventDND.xml index 5f9df0ea6..929539e25 100644 --- a/doc/en/Gdk/EventDND.xml +++ b/doc/en/Gdk/EventDND.xml @@ -15,7 +15,7 @@ - System.ValueType + Gdk.Event diff --git a/doc/en/Gdk/EventExpose.xml b/doc/en/Gdk/EventExpose.xml index 0d847b48b..b61da9553 100644 --- a/doc/en/Gdk/EventExpose.xml +++ b/doc/en/Gdk/EventExpose.xml @@ -15,7 +15,7 @@ - System.ValueType + Gdk.Event diff --git a/doc/en/Gdk/EventFocus.xml b/doc/en/Gdk/EventFocus.xml index d532c6fe0..19651d92f 100644 --- a/doc/en/Gdk/EventFocus.xml +++ b/doc/en/Gdk/EventFocus.xml @@ -15,7 +15,7 @@ - System.ValueType + Gdk.Event diff --git a/doc/en/Gdk/EventKey.xml b/doc/en/Gdk/EventKey.xml index 1de22df79..39d563b71 100644 --- a/doc/en/Gdk/EventKey.xml +++ b/doc/en/Gdk/EventKey.xml @@ -15,7 +15,7 @@ - System.ValueType + Gdk.Event diff --git a/doc/en/Gdk/EventMotion.xml b/doc/en/Gdk/EventMotion.xml index 8645404fb..7cdff7e33 100644 --- a/doc/en/Gdk/EventMotion.xml +++ b/doc/en/Gdk/EventMotion.xml @@ -15,7 +15,7 @@ - System.ValueType + Gdk.Event diff --git a/doc/en/Gdk/EventProperty.xml b/doc/en/Gdk/EventProperty.xml index 2c6ad944a..365773707 100644 --- a/doc/en/Gdk/EventProperty.xml +++ b/doc/en/Gdk/EventProperty.xml @@ -15,7 +15,7 @@ - System.ValueType + Gdk.Event diff --git a/doc/en/Gdk/EventProximity.xml b/doc/en/Gdk/EventProximity.xml index 5657cb56c..b8029b051 100644 --- a/doc/en/Gdk/EventProximity.xml +++ b/doc/en/Gdk/EventProximity.xml @@ -24,7 +24,7 @@ - System.ValueType + Gdk.Event diff --git a/doc/en/Gdk/EventScroll.xml b/doc/en/Gdk/EventScroll.xml index b5045d2ee..f1155e81a 100644 --- a/doc/en/Gdk/EventScroll.xml +++ b/doc/en/Gdk/EventScroll.xml @@ -15,7 +15,7 @@ - System.ValueType + Gdk.Event diff --git a/doc/en/Gdk/EventSelection.xml b/doc/en/Gdk/EventSelection.xml index dd887b913..466970efe 100644 --- a/doc/en/Gdk/EventSelection.xml +++ b/doc/en/Gdk/EventSelection.xml @@ -14,7 +14,7 @@ To be added - System.ValueType + Gdk.Event diff --git a/doc/en/Gdk/EventSetting.xml b/doc/en/Gdk/EventSetting.xml index 99744b28e..488719e18 100644 --- a/doc/en/Gdk/EventSetting.xml +++ b/doc/en/Gdk/EventSetting.xml @@ -14,7 +14,7 @@ None. - System.ValueType + Gdk.Event diff --git a/doc/en/Gdk/EventVisibility.xml b/doc/en/Gdk/EventVisibility.xml index 62f325226..2cd73a734 100644 --- a/doc/en/Gdk/EventVisibility.xml +++ b/doc/en/Gdk/EventVisibility.xml @@ -19,7 +19,7 @@ - System.ValueType + Gdk.Event diff --git a/doc/en/Gdk/EventWindowState.xml b/doc/en/Gdk/EventWindowState.xml index d67ba0afd..d193b9f9b 100644 --- a/doc/en/Gdk/EventWindowState.xml +++ b/doc/en/Gdk/EventWindowState.xml @@ -15,7 +15,7 @@ - System.ValueType + Gdk.Event diff --git a/doc/en/Gdk/Font.xml b/doc/en/Gdk/Font.xml index 8df2652ab..c3e2163d6 100644 --- a/doc/en/Gdk/Font.xml +++ b/doc/en/Gdk/Font.xml @@ -14,7 +14,7 @@ To be added - GLib.Opaque + System.ValueType @@ -240,4 +240,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gdk/PixbufFormat.xml b/doc/en/Gdk/PixbufFormat.xml index c059be205..e2be04a2b 100644 --- a/doc/en/Gdk/PixbufFormat.xml +++ b/doc/en/Gdk/PixbufFormat.xml @@ -14,7 +14,7 @@ Mostly for internal use. - System.ValueType + GLib.Opaque diff --git a/doc/en/Gdk/Region.xml b/doc/en/Gdk/Region.xml index f18c0afed..fae3faf20 100644 --- a/doc/en/Gdk/Region.xml +++ b/doc/en/Gdk/Region.xml @@ -14,7 +14,7 @@ - System.ValueType + GLib.Opaque diff --git a/doc/en/Gdk/Screen.xml b/doc/en/Gdk/Screen.xml index ae52c86b3..6a47d459a 100644 --- a/doc/en/Gdk/Screen.xml +++ b/doc/en/Gdk/Screen.xml @@ -14,7 +14,7 @@ To be added - GLib.Opaque + GLib.Object diff --git a/doc/en/Glade/HandlerNotFoundException.xml b/doc/en/Glade/HandlerNotFoundException.xml index 700929e37..39d0543f3 100644 --- a/doc/en/Glade/HandlerNotFoundException.xml +++ b/doc/en/Glade/HandlerNotFoundException.xml @@ -14,7 +14,7 @@ - System.Exception + System.SystemException @@ -32,7 +32,8 @@ The type of delegate that was supposed to be connected to the signal. a - + + @@ -44,7 +45,8 @@ The name of the signal that was supposed to be connected. a - + + @@ -56,7 +58,8 @@ The name of the handler that was supposed to be connected. a - + + @@ -68,7 +71,8 @@ Information about the event. a - + + @@ -88,7 +92,8 @@ a a a - + + @@ -104,7 +109,8 @@ a a a - + + @@ -126,7 +132,8 @@ a a a - + + @@ -143,8 +150,9 @@ Returns details about the object the handler was connected to. a a - + + - + \ No newline at end of file diff --git a/doc/en/Gnome/CanvasPoints.xml b/doc/en/Gnome/CanvasPoints.xml index 9ba1f012f..37764a1cb 100644 --- a/doc/en/Gnome/CanvasPoints.xml +++ b/doc/en/Gnome/CanvasPoints.xml @@ -14,7 +14,7 @@ To be added - System.ValueType + GLib.Opaque diff --git a/doc/en/Gnome/IconTheme.xml b/doc/en/Gnome/IconTheme.xml index 53a280416..09388b0a2 100644 --- a/doc/en/Gnome/IconTheme.xml +++ b/doc/en/Gnome/IconTheme.xml @@ -14,7 +14,7 @@ To be added - GLib.Object + Gtk.IconTheme diff --git a/doc/en/Gtk/Arg.xml b/doc/en/Gtk/Arg.xml index 8ef081b08..11005b00f 100644 --- a/doc/en/Gtk/Arg.xml +++ b/doc/en/Gtk/Arg.xml @@ -14,7 +14,7 @@ This class's C version is only used internally by gtkobject.c. - GLib.Opaque + System.ValueType @@ -33,7 +33,8 @@ Do not use. - + + @@ -46,7 +47,8 @@ Do not use. - + + @@ -59,7 +61,8 @@ Do not use. - + + @@ -72,7 +75,8 @@ Do not use. - + + @@ -88,8 +92,9 @@ Do not use. a a - + + - + \ No newline at end of file diff --git a/doc/en/Gtk/ButtonBoxChild.xml b/doc/en/Gtk/ButtonBoxChild.xml index 33b4ba6a5..0058f0d25 100644 --- a/doc/en/Gtk/ButtonBoxChild.xml +++ b/doc/en/Gtk/ButtonBoxChild.xml @@ -10,10 +10,11 @@ Gtk# is thread aware, but not thread safe; See the Gtk# Thread Programming for details. A child of a , used to interact with its container child properties. - + + - Gtk.Container+ContainerChild + Gtk.Box+BoxChild @@ -28,11 +29,10 @@ Whether or not the child should appear in a secondary group of children - or - + or A secondary group appears after the other children if the style is , or , and before the the other children if the style is . For horizontal button boxes, the definition of before/after depends on direction of the widget (see ). If the style is or , then the secondary children are aligned at the other end of the button box from the main children. For the other styles, they appear immediately next to the main children. - + diff --git a/doc/en/Gtk/Clipboard.xml b/doc/en/Gtk/Clipboard.xml index e7a26c966..56d260382 100644 --- a/doc/en/Gtk/Clipboard.xml +++ b/doc/en/Gtk/Clipboard.xml @@ -21,7 +21,7 @@ - GLib.Opaque + GLib.Object diff --git a/doc/en/Gtk/HTMLEmbedded.xml b/doc/en/Gtk/HTMLEmbedded.xml index 518752119..907979e7e 100644 --- a/doc/en/Gtk/HTMLEmbedded.xml +++ b/doc/en/Gtk/HTMLEmbedded.xml @@ -14,7 +14,7 @@ - GLib.Opaque + Gtk.Bin diff --git a/doc/en/Gtk/HTMLStream.xml b/doc/en/Gtk/HTMLStream.xml index c460614d3..ec325eb62 100644 --- a/doc/en/Gtk/HTMLStream.xml +++ b/doc/en/Gtk/HTMLStream.xml @@ -14,7 +14,7 @@ TODO: needs examples. - System.ValueType + GLib.Opaque @@ -178,4 +178,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/ProgressBar.xml b/doc/en/Gtk/ProgressBar.xml index 43d1eead4..e4add739f 100644 --- a/doc/en/Gtk/ProgressBar.xml +++ b/doc/en/Gtk/ProgressBar.xml @@ -25,7 +25,7 @@ - Gtk.Progress + Gtk.Widget @@ -275,7 +275,8 @@ Update the progress bar with a new percentage-done. a , the percentage completed this bar should display. - + + @@ -289,8 +290,9 @@ Public constructor. a a - + + - + \ No newline at end of file diff --git a/doc/en/Gtk/SelectionData.xml b/doc/en/Gtk/SelectionData.xml index 364202c57..51a0ba1d0 100644 --- a/doc/en/Gtk/SelectionData.xml +++ b/doc/en/Gtk/SelectionData.xml @@ -14,7 +14,7 @@ - System.ValueType + GLib.Opaque diff --git a/doc/en/Gtk/TargetList.xml b/doc/en/Gtk/TargetList.xml index baf66f9d3..7385dd3e6 100644 --- a/doc/en/Gtk/TargetList.xml +++ b/doc/en/Gtk/TargetList.xml @@ -14,7 +14,7 @@ - Glib.Opaque + GLib.Opaque @@ -194,4 +194,4 @@ - + \ No newline at end of file diff --git a/doc/en/Gtk/ThemeEngine.xml b/doc/en/Gtk/ThemeEngine.xml index cd78277ff..855961581 100644 --- a/doc/en/Gtk/ThemeEngine.xml +++ b/doc/en/Gtk/ThemeEngine.xml @@ -14,7 +14,7 @@ - GLib.Object + GLib.Opaque diff --git a/doc/en/Pango/EngineLang.xml b/doc/en/Pango/EngineLang.xml index a286341db..31f1b4016 100644 --- a/doc/en/Pango/EngineLang.xml +++ b/doc/en/Pango/EngineLang.xml @@ -14,7 +14,7 @@ The is implemented by engines that customize the rendering-system independent part of the Pango pipeline for a particular script or language. For instance, a custom could be provided for Thai to implement the dictionary-based word boundary lookups needed for that language. - System.ValueType + GLib.Opaque diff --git a/doc/en/Pango/EngineShape.xml b/doc/en/Pango/EngineShape.xml index 1b466b0c4..fa541b377 100644 --- a/doc/en/Pango/EngineShape.xml +++ b/doc/en/Pango/EngineShape.xml @@ -14,7 +14,7 @@ The class is implemented by engines that customize the rendering-system dependent part of the Pango pipeline for a particular script or language. A implementation is then specific to both a particular rendering system or group of rendering systems and to a particular script. For instance, there is one implementation to handling shaping Arabic for Fontconfig-based backends. - System.ValueType + GLib.Opaque diff --git a/doc/en/Pango/FontMetrics.xml b/doc/en/Pango/FontMetrics.xml index 9cd2507cf..15497a81b 100644 --- a/doc/en/Pango/FontMetrics.xml +++ b/doc/en/Pango/FontMetrics.xml @@ -14,7 +14,7 @@ - System.ValueType + GLib.Opaque diff --git a/doc/en/Pango/LayoutLine.xml b/doc/en/Pango/LayoutLine.xml index 29e790b4f..74cab3ebe 100644 --- a/doc/en/Pango/LayoutLine.xml +++ b/doc/en/Pango/LayoutLine.xml @@ -15,7 +15,7 @@ s are obtained by calling and are only valid until the text, attributes, or settings of the parent are modified. - System.ValueType + GLib.Opaque diff --git a/doc/updater/updater.cs b/doc/updater/updater.cs index 2573d635c..f77082519 100644 --- a/doc/updater/updater.cs +++ b/doc/updater/updater.cs @@ -153,6 +153,12 @@ class Updater { if (!t.IsAbstract && typeof (System.Delegate).IsAssignableFrom (t)) return CompareDelegate (t, doc); + XmlNode base_type = doc.SelectSingleNode ("/Type/Base/BaseTypeName"); + if (base_type != null && base_type.InnerText != GetBaseType (t)) { + base_type.InnerText = GetBaseType (t); + changed = true; + } + TypeReflector reflector = new TypeReflector (t); changed |= Compare (doc, MemberType.Field, reflector.Fields, GetNodesOfType (doc, "Field")); changed |= Compare (doc, MemberType.Property, reflector.Properties, GetNodesOfType (doc, "Property")); @@ -519,8 +525,8 @@ class Updater { XmlDocument Generate (Type type) { - bool isDelagate; - string signature = AddTypeSignature (type, out isDelagate); + bool isDelegate; + string signature = AddTypeSignature (type, out isDelegate); if (signature == null) return null; @@ -607,17 +613,9 @@ class Updater { XmlElement base_node = document.CreateElement ("Base"); type_node.AppendChild (base_node); - if (type.IsEnum) - base_node.AppendChild (AddElement (document, "BaseTypeName", "System.Enum")); - - else if (type.IsValueType) - base_node.AppendChild (AddElement (document, "BaseTypeName", "System.ValueType")); - - else if (isDelagate) - base_node.AppendChild (AddElement (document, "BaseTypeName", "System.Delegate")); - - else if (type.IsClass && type != typeof (object)) - base_node.AppendChild (AddElement (document, "BaseTypeName", type.BaseType.FullName)); + string base_type = GetBaseType (type); + if (base_type != null) + base_node.AppendChild (AddElement (document, "BaseTypeName", base_type)); // // @@ -653,7 +651,7 @@ class Updater { // // delegates have an empty element. // - if (isDelagate) + if (isDelegate) members = document.CreateElement ("Members"); else members = AddMembersNode (document, type); @@ -663,7 +661,7 @@ class Updater { // // delegates have a top-level parameters and return value section // - if (isDelagate) { + if (isDelegate) { System.Reflection.MethodInfo method = type.GetMethod ("Invoke"); Type return_type = method.ReturnType; ParameterInfo [] parameters = method.GetParameters (); @@ -1009,6 +1007,20 @@ class Updater { throw new ArgumentException (); } + string GetBaseType (Type t) + { + if (t.IsEnum) + return "System.Enum"; + else if (t.IsValueType) + return "System.ValueType"; + else if (!t.IsAbstract && typeof (System.Delegate).IsAssignableFrom (t)) + return "System.Delegate"; + else if (t.IsClass && t != typeof (object)) + return t.BaseType.FullName; + else + return null; + } + string GetTypeVisibility (TypeAttributes ta) { switch (ta & TypeAttributes.VisibilityMask){ @@ -1026,10 +1038,10 @@ class Updater { } } - string AddTypeSignature (Type type, out bool isDelagate) + string AddTypeSignature (Type type, out bool isDelegate) { // Assume it is not a delegate - isDelagate = false; + isDelegate = false; if (type == null) return null; @@ -1061,7 +1073,7 @@ class Updater { // if (kind == "class" && !type.IsAbstract && typeof (System.Delegate).IsAssignableFrom (type)) { - isDelagate = true; + isDelegate = true; return AddDelegateSignature (visibility, modifiers, name, type); }