recopy trunk corcompare file and refresh base APIs
svn path=/trunk/gtk-sharp/; revision=63231
This commit is contained in:
Mike Kestner
parent
24269861e8
commit
2650065d9a
10 changed files with 7147 additions and 6950 deletions
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -24,7 +24,7 @@
|
|||
<field name="Zero" attrib="22" fieldtype="Glade.AccelInfo" />
|
||||
</fields>
|
||||
<methods>
|
||||
<method name="New(System.IntPtr)" attrib="150" returntype="Glade.AccelInfo">
|
||||
<method name="New(System.IntPtr)" attrib="150" static="true" returntype="Glade.AccelInfo">
|
||||
<parameters>
|
||||
<parameter name="raw" position="0" attrib="0" type="System.IntPtr" />
|
||||
</parameters>
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
<interface name="System.Runtime.Serialization.ISerializable" />
|
||||
</interfaces>
|
||||
<constructors>
|
||||
<constructor name=".ctor(System.Object, System.IntPtr)" attrib="6278">
|
||||
<constructor name=".ctor(System.Object, System.IntPtr)" attrib="2182">
|
||||
<parameters>
|
||||
<parameter name="object" position="0" attrib="0" type="System.Object" />
|
||||
<parameter name="method" position="1" attrib="0" type="System.IntPtr" />
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
</constructor>
|
||||
</constructors>
|
||||
<methods>
|
||||
<method name="BeginInvoke(Glade.XML, Gtk.Widget, System.String, System.String, System.AsyncCallback, System.Object)" attrib="454" returntype="System.IAsyncResult">
|
||||
<method name="BeginInvoke(Glade.XML, Gtk.Widget, System.String, System.String, System.AsyncCallback, System.Object)" attrib="454" virtual="true" returntype="System.IAsyncResult">
|
||||
<parameters>
|
||||
<parameter name="xml" position="0" attrib="0" type="Glade.XML" />
|
||||
<parameter name="widget" position="1" attrib="0" type="Gtk.Widget" />
|
||||
|
|
@ -55,12 +55,12 @@
|
|||
<parameter name="object" position="5" attrib="0" type="System.Object" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="EndInvoke(System.IAsyncResult)" attrib="454" returntype="System.Void">
|
||||
<method name="EndInvoke(System.IAsyncResult)" attrib="454" virtual="true" returntype="System.Void">
|
||||
<parameters>
|
||||
<parameter name="result" position="0" attrib="0" type="System.IAsyncResult" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="Invoke(Glade.XML, Gtk.Widget, System.String, System.String)" attrib="454" returntype="System.Void">
|
||||
<method name="Invoke(Glade.XML, Gtk.Widget, System.String, System.String)" attrib="454" virtual="true" returntype="System.Void">
|
||||
<parameters>
|
||||
<parameter name="xml" position="0" attrib="0" type="Glade.XML" />
|
||||
<parameter name="widget" position="1" attrib="0" type="Gtk.Widget" />
|
||||
|
|
@ -77,7 +77,7 @@
|
|||
<field name="Zero" attrib="22" fieldtype="Glade.AtkActionInfo" />
|
||||
</fields>
|
||||
<methods>
|
||||
<method name="New(System.IntPtr)" attrib="150" returntype="Glade.AtkActionInfo">
|
||||
<method name="New(System.IntPtr)" attrib="150" static="true" returntype="Glade.AtkActionInfo">
|
||||
<parameters>
|
||||
<parameter name="raw" position="0" attrib="0" type="System.IntPtr" />
|
||||
</parameters>
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
<field name="Zero" attrib="22" fieldtype="Glade.AtkRelationInfo" />
|
||||
</fields>
|
||||
<methods>
|
||||
<method name="New(System.IntPtr)" attrib="150" returntype="Glade.AtkRelationInfo">
|
||||
<method name="New(System.IntPtr)" attrib="150" static="true" returntype="Glade.AtkRelationInfo">
|
||||
<parameters>
|
||||
<parameter name="raw" position="0" attrib="0" type="System.IntPtr" />
|
||||
</parameters>
|
||||
|
|
@ -104,7 +104,7 @@
|
|||
<interface name="System.Runtime.Serialization.ISerializable" />
|
||||
</interfaces>
|
||||
<constructors>
|
||||
<constructor name=".ctor(System.Object, System.IntPtr)" attrib="6278">
|
||||
<constructor name=".ctor(System.Object, System.IntPtr)" attrib="2182">
|
||||
<parameters>
|
||||
<parameter name="object" position="0" attrib="0" type="System.Object" />
|
||||
<parameter name="method" position="1" attrib="0" type="System.IntPtr" />
|
||||
|
|
@ -112,7 +112,7 @@
|
|||
</constructor>
|
||||
</constructors>
|
||||
<methods>
|
||||
<method name="BeginInvoke(Glade.XML, Gtk.Widget, Glade.WidgetInfo, System.AsyncCallback, System.Object)" attrib="454" returntype="System.IAsyncResult">
|
||||
<method name="BeginInvoke(Glade.XML, Gtk.Widget, Glade.WidgetInfo, System.AsyncCallback, System.Object)" attrib="454" virtual="true" returntype="System.IAsyncResult">
|
||||
<parameters>
|
||||
<parameter name="xml" position="0" attrib="0" type="Glade.XML" />
|
||||
<parameter name="parent" position="1" attrib="0" type="Gtk.Widget" />
|
||||
|
|
@ -121,12 +121,12 @@
|
|||
<parameter name="object" position="4" attrib="0" type="System.Object" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="EndInvoke(System.IAsyncResult)" attrib="454" returntype="System.Void">
|
||||
<method name="EndInvoke(System.IAsyncResult)" attrib="454" virtual="true" returntype="System.Void">
|
||||
<parameters>
|
||||
<parameter name="result" position="0" attrib="0" type="System.IAsyncResult" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="Invoke(Glade.XML, Gtk.Widget, Glade.WidgetInfo)" attrib="454" returntype="System.Void">
|
||||
<method name="Invoke(Glade.XML, Gtk.Widget, Glade.WidgetInfo)" attrib="454" virtual="true" returntype="System.Void">
|
||||
<parameters>
|
||||
<parameter name="xml" position="0" attrib="0" type="Glade.XML" />
|
||||
<parameter name="parent" position="1" attrib="0" type="Gtk.Widget" />
|
||||
|
|
@ -144,21 +144,21 @@
|
|||
<properties>
|
||||
<property name="child" attrib="0" ptype="Glade.WidgetInfo" params="">
|
||||
<methods>
|
||||
<method name="get_child()" returntype="Glade.WidgetInfo">
|
||||
<method name="get_child()" attrib="2182" returntype="Glade.WidgetInfo">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
<property name="properties" attrib="0" ptype="Glade.Property" params="">
|
||||
<methods>
|
||||
<method name="get_properties()" returntype="Glade.Property">
|
||||
<method name="get_properties()" attrib="2182" returntype="Glade.Property">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
</properties>
|
||||
<methods>
|
||||
<method name="New(System.IntPtr)" attrib="150" returntype="Glade.ChildInfo">
|
||||
<method name="New(System.IntPtr)" attrib="150" static="true" returntype="Glade.ChildInfo">
|
||||
<parameters>
|
||||
<parameter name="raw" position="0" attrib="0" type="System.IntPtr" />
|
||||
</parameters>
|
||||
|
|
@ -171,7 +171,7 @@
|
|||
<interface name="System.Runtime.Serialization.ISerializable" />
|
||||
</interfaces>
|
||||
<constructors>
|
||||
<constructor name=".ctor(System.Object, System.IntPtr)" attrib="6278">
|
||||
<constructor name=".ctor(System.Object, System.IntPtr)" attrib="2182">
|
||||
<parameters>
|
||||
<parameter name="object" position="0" attrib="0" type="System.Object" />
|
||||
<parameter name="method" position="1" attrib="0" type="System.IntPtr" />
|
||||
|
|
@ -179,7 +179,7 @@
|
|||
</constructor>
|
||||
</constructors>
|
||||
<methods>
|
||||
<method name="BeginInvoke(Glade.XML, Gtk.Widget, System.String, System.AsyncCallback, System.Object)" attrib="454" returntype="System.IAsyncResult">
|
||||
<method name="BeginInvoke(Glade.XML, Gtk.Widget, System.String, System.AsyncCallback, System.Object)" attrib="454" virtual="true" returntype="System.IAsyncResult">
|
||||
<parameters>
|
||||
<parameter name="xml" position="0" attrib="0" type="Glade.XML" />
|
||||
<parameter name="parent" position="1" attrib="0" type="Gtk.Widget" />
|
||||
|
|
@ -188,12 +188,12 @@
|
|||
<parameter name="object" position="4" attrib="0" type="System.Object" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="EndInvoke(System.IAsyncResult)" attrib="454" returntype="Gtk.Widget">
|
||||
<method name="EndInvoke(System.IAsyncResult)" attrib="454" virtual="true" returntype="Gtk.Widget">
|
||||
<parameters>
|
||||
<parameter name="result" position="0" attrib="0" type="System.IAsyncResult" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="Invoke(Glade.XML, Gtk.Widget, System.String)" attrib="454" returntype="Gtk.Widget">
|
||||
<method name="Invoke(Glade.XML, Gtk.Widget, System.String)" attrib="454" virtual="true" returntype="Gtk.Widget">
|
||||
<parameters>
|
||||
<parameter name="xml" position="0" attrib="0" type="Glade.XML" />
|
||||
<parameter name="parent" position="1" attrib="0" type="Gtk.Widget" />
|
||||
|
|
@ -204,46 +204,46 @@
|
|||
</class>
|
||||
<class name="Global" type="class" base="System.Object" charset="Ansi" layout="Auto">
|
||||
<constructors>
|
||||
<constructor name=".ctor()" attrib="6278">
|
||||
<constructor name=".ctor()" attrib="2182">
|
||||
<parameters />
|
||||
</constructor>
|
||||
</constructors>
|
||||
<methods>
|
||||
<method name="EnumFromString(GLib.GType, System.String)" attrib="150" returntype="System.Int32">
|
||||
<method name="EnumFromString(GLib.GType, System.String)" attrib="150" static="true" returntype="System.Int32">
|
||||
<parameters>
|
||||
<parameter name="type" position="0" attrib="0" type="GLib.GType" />
|
||||
<parameter name="str1ng" position="1" attrib="0" type="System.String" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="FlagsFromString(GLib.GType, System.String)" attrib="150" returntype="System.UInt32">
|
||||
<method name="FlagsFromString(GLib.GType, System.String)" attrib="150" static="true" returntype="System.UInt32">
|
||||
<parameters>
|
||||
<parameter name="type" position="0" attrib="0" type="GLib.GType" />
|
||||
<parameter name="str1ng" position="1" attrib="0" type="System.String" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetWidgetName(Gtk.Widget)" attrib="150" returntype="System.String">
|
||||
<method name="GetWidgetName(Gtk.Widget)" attrib="150" static="true" returntype="System.String">
|
||||
<parameters>
|
||||
<parameter name="widget" position="0" attrib="0" type="Gtk.Widget" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetWidgetTree(Gtk.Widget)" attrib="150" returntype="Glade.XML">
|
||||
<method name="GetWidgetTree(Gtk.Widget)" attrib="150" static="true" returntype="Glade.XML">
|
||||
<parameters>
|
||||
<parameter name="widget" position="0" attrib="0" type="Gtk.Widget" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="ModuleCheckVersion(System.Int32)" attrib="150" returntype="System.String">
|
||||
<method name="ModuleCheckVersion(System.Int32)" attrib="150" static="true" returntype="System.String">
|
||||
<parameters>
|
||||
<parameter name="version" position="0" attrib="0" type="System.Int32" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="RegisterCustomProp(GLib.GType, System.String, Glade.ApplyCustomPropFunc)" attrib="150" returntype="System.Void">
|
||||
<method name="RegisterCustomProp(GLib.GType, System.String, Glade.ApplyCustomPropFunc)" attrib="150" static="true" returntype="System.Void">
|
||||
<parameters>
|
||||
<parameter name="type" position="0" attrib="0" type="GLib.GType" />
|
||||
<parameter name="prop_name" position="1" attrib="0" type="System.String" />
|
||||
<parameter name="apply_prop" position="2" attrib="0" type="Glade.ApplyCustomPropFunc" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="RegisterWidget(GLib.GType, Glade.NewFunc, Glade.BuildChildrenFunc, Glade.FindInternalChildFunc)" attrib="150" returntype="System.Void">
|
||||
<method name="RegisterWidget(GLib.GType, Glade.NewFunc, Glade.BuildChildrenFunc, Glade.FindInternalChildFunc)" attrib="150" static="true" returntype="System.Void">
|
||||
<parameters>
|
||||
<parameter name="type" position="0" attrib="0" type="GLib.GType" />
|
||||
<parameter name="new_func" position="1" attrib="0" type="Glade.NewFunc" />
|
||||
|
|
@ -251,7 +251,7 @@
|
|||
<parameter name="find_internal_child" position="3" attrib="0" type="Glade.FindInternalChildFunc" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="SetCustomHandler(Glade.XMLCustomWidgetHandler)" attrib="150" returntype="System.Void">
|
||||
<method name="SetCustomHandler(Glade.XMLCustomWidgetHandler)" attrib="150" static="true" returntype="System.Void">
|
||||
<attributes>
|
||||
<attribute name="System.ObsoleteAttribute">
|
||||
<properties>
|
||||
|
|
@ -271,7 +271,7 @@
|
|||
<interface name="System.Runtime.Serialization.ISerializable" />
|
||||
</interfaces>
|
||||
<constructors>
|
||||
<constructor name=".ctor(System.String, System.String, System.String, System.Reflection.EventInfo, System.Type)" attrib="6278">
|
||||
<constructor name=".ctor(System.String, System.String, System.String, System.Reflection.EventInfo, System.Type)" attrib="2182">
|
||||
<parameters>
|
||||
<parameter name="message" position="0" attrib="0" type="System.String" />
|
||||
<parameter name="handler_name" position="1" attrib="0" type="System.String" />
|
||||
|
|
@ -280,13 +280,13 @@
|
|||
<parameter name="delegate_type" position="4" attrib="0" type="System.Type" />
|
||||
</parameters>
|
||||
</constructor>
|
||||
<constructor name=".ctor(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)" attrib="6276">
|
||||
<constructor name=".ctor(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)" attrib="2180">
|
||||
<parameters>
|
||||
<parameter name="info" position="0" attrib="0" type="System.Runtime.Serialization.SerializationInfo" />
|
||||
<parameter name="context" position="1" attrib="0" type="System.Runtime.Serialization.StreamingContext" />
|
||||
</parameters>
|
||||
</constructor>
|
||||
<constructor name=".ctor(System.String, System.String, System.Reflection.EventInfo, System.Type)" attrib="6278">
|
||||
<constructor name=".ctor(System.String, System.String, System.Reflection.EventInfo, System.Type)" attrib="2182">
|
||||
<parameters>
|
||||
<parameter name="handler_name" position="0" attrib="0" type="System.String" />
|
||||
<parameter name="signal_name" position="1" attrib="0" type="System.String" />
|
||||
|
|
@ -294,7 +294,7 @@
|
|||
<parameter name="delegate_type" position="3" attrib="0" type="System.Type" />
|
||||
</parameters>
|
||||
</constructor>
|
||||
<constructor name=".ctor(System.String, System.String, System.Reflection.EventInfo, System.Type, System.Exception)" attrib="6278">
|
||||
<constructor name=".ctor(System.String, System.String, System.Reflection.EventInfo, System.Type, System.Exception)" attrib="2182">
|
||||
<parameters>
|
||||
<parameter name="handler_name" position="0" attrib="0" type="System.String" />
|
||||
<parameter name="signal_name" position="1" attrib="0" type="System.String" />
|
||||
|
|
@ -307,35 +307,35 @@
|
|||
<properties>
|
||||
<property name="DelegateType" attrib="0" ptype="System.Type" params="">
|
||||
<methods>
|
||||
<method name="get_DelegateType()" returntype="System.Type">
|
||||
<method name="get_DelegateType()" attrib="2182" returntype="System.Type">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
<property name="Event" attrib="0" ptype="System.Reflection.EventInfo" params="">
|
||||
<methods>
|
||||
<method name="get_Event()" returntype="System.Reflection.EventInfo">
|
||||
<method name="get_Event()" attrib="2182" returntype="System.Reflection.EventInfo">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
<property name="HandlerName" attrib="0" ptype="System.String" params="">
|
||||
<methods>
|
||||
<method name="get_HandlerName()" returntype="System.String">
|
||||
<method name="get_HandlerName()" attrib="2182" returntype="System.String">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
<property name="SignalName" attrib="0" ptype="System.String" params="">
|
||||
<methods>
|
||||
<method name="get_SignalName()" returntype="System.String">
|
||||
<method name="get_SignalName()" attrib="2182" returntype="System.String">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
</properties>
|
||||
<methods>
|
||||
<method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)" attrib="198" returntype="System.Void">
|
||||
<method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)" attrib="198" virtual="true" returntype="System.Void">
|
||||
<parameters>
|
||||
<parameter name="info" position="0" attrib="0" type="System.Runtime.Serialization.SerializationInfo" />
|
||||
<parameter name="context" position="1" attrib="0" type="System.Runtime.Serialization.StreamingContext" />
|
||||
|
|
@ -361,14 +361,14 @@
|
|||
</attribute>
|
||||
</attributes>
|
||||
<methods>
|
||||
<method name="get_toplevels()" returntype="Glade.WidgetInfo">
|
||||
<method name="get_toplevels()" attrib="2182" returntype="Glade.WidgetInfo">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
<property name="Toplevels" attrib="0" ptype="Glade.WidgetInfo[]" params="">
|
||||
<methods>
|
||||
<method name="get_Toplevels()" returntype="Glade.WidgetInfo[]">
|
||||
<method name="get_Toplevels()" attrib="2182" returntype="Glade.WidgetInfo[]">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
|
|
@ -383,7 +383,7 @@
|
|||
<parameter name="filename" position="0" attrib="0" type="System.String" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="New(System.IntPtr)" attrib="150" returntype="Glade.Interface">
|
||||
<method name="New(System.IntPtr)" attrib="150" static="true" returntype="Glade.Interface">
|
||||
<parameters>
|
||||
<parameter name="raw" position="0" attrib="0" type="System.IntPtr" />
|
||||
</parameters>
|
||||
|
|
@ -396,7 +396,7 @@
|
|||
<interface name="System.Runtime.Serialization.ISerializable" />
|
||||
</interfaces>
|
||||
<constructors>
|
||||
<constructor name=".ctor(System.Object, System.IntPtr)" attrib="6278">
|
||||
<constructor name=".ctor(System.Object, System.IntPtr)" attrib="2182">
|
||||
<parameters>
|
||||
<parameter name="object" position="0" attrib="0" type="System.Object" />
|
||||
<parameter name="method" position="1" attrib="0" type="System.IntPtr" />
|
||||
|
|
@ -404,7 +404,7 @@
|
|||
</constructor>
|
||||
</constructors>
|
||||
<methods>
|
||||
<method name="BeginInvoke(Glade.XML, GLib.GType, Glade.WidgetInfo, System.AsyncCallback, System.Object)" attrib="454" returntype="System.IAsyncResult">
|
||||
<method name="BeginInvoke(Glade.XML, GLib.GType, Glade.WidgetInfo, System.AsyncCallback, System.Object)" attrib="454" virtual="true" returntype="System.IAsyncResult">
|
||||
<parameters>
|
||||
<parameter name="xml" position="0" attrib="0" type="Glade.XML" />
|
||||
<parameter name="widget_type" position="1" attrib="0" type="GLib.GType" />
|
||||
|
|
@ -413,12 +413,12 @@
|
|||
<parameter name="object" position="4" attrib="0" type="System.Object" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="EndInvoke(System.IAsyncResult)" attrib="454" returntype="Gtk.Widget">
|
||||
<method name="EndInvoke(System.IAsyncResult)" attrib="454" virtual="true" returntype="Gtk.Widget">
|
||||
<parameters>
|
||||
<parameter name="result" position="0" attrib="0" type="System.IAsyncResult" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="Invoke(Glade.XML, GLib.GType, Glade.WidgetInfo)" attrib="454" returntype="Gtk.Widget">
|
||||
<method name="Invoke(Glade.XML, GLib.GType, Glade.WidgetInfo)" attrib="454" virtual="true" returntype="Gtk.Widget">
|
||||
<parameters>
|
||||
<parameter name="xml" position="0" attrib="0" type="Glade.XML" />
|
||||
<parameter name="widget_type" position="1" attrib="0" type="GLib.GType" />
|
||||
|
|
@ -429,18 +429,18 @@
|
|||
</class>
|
||||
<class name="Parser" type="class" base="System.Object" charset="Ansi" layout="Auto">
|
||||
<constructors>
|
||||
<constructor name=".ctor()" attrib="6278">
|
||||
<constructor name=".ctor()" attrib="2182">
|
||||
<parameters />
|
||||
</constructor>
|
||||
</constructors>
|
||||
<methods>
|
||||
<method name="ParseBuffer(System.String, System.String)" attrib="150" returntype="Glade.Interface">
|
||||
<method name="ParseBuffer(System.String, System.String)" attrib="150" static="true" returntype="Glade.Interface">
|
||||
<parameters>
|
||||
<parameter name="buffer" position="0" attrib="0" type="System.String" />
|
||||
<parameter name="domain" position="1" attrib="0" type="System.String" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="ParseFile(System.String, System.String)" attrib="150" returntype="Glade.Interface">
|
||||
<method name="ParseFile(System.String, System.String)" attrib="150" static="true" returntype="Glade.Interface">
|
||||
<parameters>
|
||||
<parameter name="file" position="0" attrib="0" type="System.String" />
|
||||
<parameter name="domain" position="1" attrib="0" type="System.String" />
|
||||
|
|
@ -455,7 +455,7 @@
|
|||
<field name="Zero" attrib="22" fieldtype="Glade.Property" />
|
||||
</fields>
|
||||
<methods>
|
||||
<method name="New(System.IntPtr)" attrib="150" returntype="Glade.Property">
|
||||
<method name="New(System.IntPtr)" attrib="150" static="true" returntype="Glade.Property">
|
||||
<parameters>
|
||||
<parameter name="raw" position="0" attrib="0" type="System.IntPtr" />
|
||||
</parameters>
|
||||
|
|
@ -472,10 +472,10 @@
|
|||
<properties>
|
||||
<property name="After" attrib="0" ptype="System.Boolean" params="">
|
||||
<methods>
|
||||
<method name="get_After()" returntype="System.Boolean">
|
||||
<method name="get_After()" attrib="2182" returntype="System.Boolean">
|
||||
<parameters />
|
||||
</method>
|
||||
<method name="set_After(System.Boolean)" returntype="System.Void">
|
||||
<method name="set_After(System.Boolean)" attrib="2182" returntype="System.Void">
|
||||
<parameters>
|
||||
<parameter name="value" position="0" attrib="0" type="System.Boolean" />
|
||||
</parameters>
|
||||
|
|
@ -484,7 +484,7 @@
|
|||
</property>
|
||||
</properties>
|
||||
<methods>
|
||||
<method name="New(System.IntPtr)" attrib="150" returntype="Glade.SignalInfo">
|
||||
<method name="New(System.IntPtr)" attrib="150" static="true" returntype="Glade.SignalInfo">
|
||||
<parameters>
|
||||
<parameter name="raw" position="0" attrib="0" type="System.IntPtr" />
|
||||
</parameters>
|
||||
|
|
@ -493,19 +493,19 @@
|
|||
</class>
|
||||
<class name="Standard" type="class" base="System.Object" charset="Ansi" layout="Auto">
|
||||
<constructors>
|
||||
<constructor name=".ctor()" attrib="6278">
|
||||
<constructor name=".ctor()" attrib="2182">
|
||||
<parameters />
|
||||
</constructor>
|
||||
</constructors>
|
||||
<methods>
|
||||
<method name="BuildChildren(Glade.XML, Gtk.Widget, Glade.WidgetInfo)" attrib="150" returntype="System.Void">
|
||||
<method name="BuildChildren(Glade.XML, Gtk.Widget, Glade.WidgetInfo)" attrib="150" static="true" returntype="System.Void">
|
||||
<parameters>
|
||||
<parameter name="self" position="0" attrib="0" type="Glade.XML" />
|
||||
<parameter name="parent" position="1" attrib="0" type="Gtk.Widget" />
|
||||
<parameter name="info" position="2" attrib="0" type="Glade.WidgetInfo" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="BuildWidget(Glade.XML, GLib.GType, Glade.WidgetInfo)" attrib="150" returntype="Gtk.Widget">
|
||||
<method name="BuildWidget(Glade.XML, GLib.GType, Glade.WidgetInfo)" attrib="150" static="true" returntype="Gtk.Widget">
|
||||
<parameters>
|
||||
<parameter name="xml" position="0" attrib="0" type="Glade.XML" />
|
||||
<parameter name="widget_type" position="1" attrib="0" type="GLib.GType" />
|
||||
|
|
@ -528,10 +528,10 @@
|
|||
<interface name="System.Runtime.InteropServices._Attribute" />
|
||||
</interfaces>
|
||||
<constructors>
|
||||
<constructor name=".ctor()" attrib="6278">
|
||||
<constructor name=".ctor()" attrib="2182">
|
||||
<parameters />
|
||||
</constructor>
|
||||
<constructor name=".ctor(System.String)" attrib="6278">
|
||||
<constructor name=".ctor(System.String)" attrib="2182">
|
||||
<parameters>
|
||||
<parameter name="name" position="0" attrib="0" type="System.String" />
|
||||
</parameters>
|
||||
|
|
@ -540,14 +540,14 @@
|
|||
<properties>
|
||||
<property name="Name" attrib="0" ptype="System.String" params="">
|
||||
<methods>
|
||||
<method name="get_Name()" returntype="System.String">
|
||||
<method name="get_Name()" attrib="2182" returntype="System.String">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
<property name="Specified" attrib="0" ptype="System.Boolean" params="">
|
||||
<methods>
|
||||
<method name="get_Specified()" returntype="System.Boolean">
|
||||
<method name="get_Specified()" attrib="2182" returntype="System.Boolean">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
|
|
@ -570,63 +570,63 @@
|
|||
<properties>
|
||||
<property name="accels" attrib="0" ptype="Glade.AccelInfo" params="">
|
||||
<methods>
|
||||
<method name="get_accels()" returntype="Glade.AccelInfo">
|
||||
<method name="get_accels()" attrib="2182" returntype="Glade.AccelInfo">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
<property name="atk_actions" attrib="0" ptype="Glade.AtkActionInfo" params="">
|
||||
<methods>
|
||||
<method name="get_atk_actions()" returntype="Glade.AtkActionInfo">
|
||||
<method name="get_atk_actions()" attrib="2182" returntype="Glade.AtkActionInfo">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
<property name="atk_props" attrib="0" ptype="Glade.Property" params="">
|
||||
<methods>
|
||||
<method name="get_atk_props()" returntype="Glade.Property">
|
||||
<method name="get_atk_props()" attrib="2182" returntype="Glade.Property">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
<property name="children" attrib="0" ptype="Glade.ChildInfo" params="">
|
||||
<methods>
|
||||
<method name="get_children()" returntype="Glade.ChildInfo">
|
||||
<method name="get_children()" attrib="2182" returntype="Glade.ChildInfo">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
<property name="parent" attrib="0" ptype="Glade.WidgetInfo" params="">
|
||||
<methods>
|
||||
<method name="get_parent()" returntype="Glade.WidgetInfo">
|
||||
<method name="get_parent()" attrib="2182" returntype="Glade.WidgetInfo">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
<property name="properties" attrib="0" ptype="Glade.Property" params="">
|
||||
<methods>
|
||||
<method name="get_properties()" returntype="Glade.Property">
|
||||
<method name="get_properties()" attrib="2182" returntype="Glade.Property">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
<property name="relations" attrib="0" ptype="Glade.AtkRelationInfo" params="">
|
||||
<methods>
|
||||
<method name="get_relations()" returntype="Glade.AtkRelationInfo">
|
||||
<method name="get_relations()" attrib="2182" returntype="Glade.AtkRelationInfo">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
<property name="signals" attrib="0" ptype="Glade.SignalInfo" params="">
|
||||
<methods>
|
||||
<method name="get_signals()" returntype="Glade.SignalInfo">
|
||||
<method name="get_signals()" attrib="2182" returntype="Glade.SignalInfo">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
</properties>
|
||||
<methods>
|
||||
<method name="New(System.IntPtr)" attrib="150" returntype="Glade.WidgetInfo">
|
||||
<method name="New(System.IntPtr)" attrib="150" static="true" returntype="Glade.WidgetInfo">
|
||||
<parameters>
|
||||
<parameter name="raw" position="0" attrib="0" type="System.IntPtr" />
|
||||
</parameters>
|
||||
|
|
@ -646,20 +646,20 @@
|
|||
<interface name="System.IDisposable" />
|
||||
</interfaces>
|
||||
<constructors>
|
||||
<constructor name=".ctor(System.IO.Stream, System.String, System.String)" attrib="6278">
|
||||
<constructor name=".ctor(System.IO.Stream, System.String, System.String)" attrib="2182">
|
||||
<parameters>
|
||||
<parameter name="s" position="0" attrib="0" type="System.IO.Stream" />
|
||||
<parameter name="root" position="1" attrib="0" type="System.String" />
|
||||
<parameter name="domain" position="2" attrib="0" type="System.String" />
|
||||
</parameters>
|
||||
</constructor>
|
||||
<constructor name=".ctor(System.String, System.String)" attrib="6278">
|
||||
<constructor name=".ctor(System.String, System.String)" attrib="2182">
|
||||
<parameters>
|
||||
<parameter name="resource_name" position="0" attrib="0" type="System.String" />
|
||||
<parameter name="root" position="1" attrib="0" type="System.String" />
|
||||
</parameters>
|
||||
</constructor>
|
||||
<constructor name=".ctor(System.Reflection.Assembly, System.String, System.String, System.String)" attrib="6278">
|
||||
<constructor name=".ctor(System.Reflection.Assembly, System.String, System.String, System.String)" attrib="2182">
|
||||
<parameters>
|
||||
<parameter name="assembly" position="0" attrib="0" type="System.Reflection.Assembly" />
|
||||
<parameter name="resource_name" position="1" attrib="0" type="System.String" />
|
||||
|
|
@ -667,7 +667,7 @@
|
|||
<parameter name="domain" position="3" attrib="0" type="System.String" />
|
||||
</parameters>
|
||||
</constructor>
|
||||
<constructor name=".ctor(System.String, System.Int32, System.String, System.String)" attrib="6278">
|
||||
<constructor name=".ctor(System.String, System.Int32, System.String, System.String)" attrib="2182">
|
||||
<parameters>
|
||||
<parameter name="buffer" position="0" attrib="0" type="System.String" />
|
||||
<parameter name="size" position="1" attrib="0" type="System.Int32" />
|
||||
|
|
@ -675,7 +675,7 @@
|
|||
<parameter name="domain" position="3" attrib="0" type="System.String" />
|
||||
</parameters>
|
||||
</constructor>
|
||||
<constructor name=".ctor(GLib.GType)" attrib="6276">
|
||||
<constructor name=".ctor(GLib.GType)" attrib="2180">
|
||||
<attributes>
|
||||
<attribute name="System.ObsoleteAttribute">
|
||||
<properties>
|
||||
|
|
@ -688,12 +688,12 @@
|
|||
<parameter name="gtype" position="0" attrib="0" type="GLib.GType" />
|
||||
</parameters>
|
||||
</constructor>
|
||||
<constructor name=".ctor(System.IntPtr)" attrib="6278">
|
||||
<constructor name=".ctor(System.IntPtr)" attrib="2182">
|
||||
<parameters>
|
||||
<parameter name="raw" position="0" attrib="0" type="System.IntPtr" />
|
||||
</parameters>
|
||||
</constructor>
|
||||
<constructor name=".ctor(System.String, System.String, System.String)" attrib="6278">
|
||||
<constructor name=".ctor(System.String, System.String, System.String)" attrib="2182">
|
||||
<parameters>
|
||||
<parameter name="fname" position="0" attrib="0" type="System.String" />
|
||||
<parameter name="root" position="1" attrib="0" type="System.String" />
|
||||
|
|
@ -704,7 +704,7 @@
|
|||
<properties>
|
||||
<property name="CustomHandler" attrib="0" ptype="Glade.XMLCustomWidgetHandler" params="Glade.XMLCustomWidgetHandler">
|
||||
<methods>
|
||||
<method name="set_CustomHandler(Glade.XMLCustomWidgetHandler)" returntype="System.Void">
|
||||
<method name="set_CustomHandler(Glade.XMLCustomWidgetHandler)" attrib="2198" static="true" returntype="System.Void">
|
||||
<parameters>
|
||||
<parameter name="value" position="0" attrib="0" type="Glade.XMLCustomWidgetHandler" />
|
||||
</parameters>
|
||||
|
|
@ -713,21 +713,21 @@
|
|||
</property>
|
||||
<property name="Filename" attrib="0" ptype="System.String" params="">
|
||||
<methods>
|
||||
<method name="get_Filename()" returntype="System.String">
|
||||
<method name="get_Filename()" attrib="2182" returntype="System.String">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
<property name="GType" attrib="0" ptype="GLib.GType" params="">
|
||||
<methods>
|
||||
<method name="get_GType()" returntype="GLib.GType">
|
||||
<method name="get_GType()" attrib="2198" static="true" returntype="GLib.GType">
|
||||
<parameters />
|
||||
</method>
|
||||
</methods>
|
||||
</property>
|
||||
<property name="Item" attrib="0" ptype="Gtk.Widget" params="System.String">
|
||||
<methods>
|
||||
<method name="get_Item(System.String)" returntype="Gtk.Widget">
|
||||
<method name="get_Item(System.String)" attrib="2182" returntype="Gtk.Widget">
|
||||
<parameters>
|
||||
<parameter name="name" position="0" attrib="0" type="System.String" />
|
||||
</parameters>
|
||||
|
|
@ -736,7 +736,7 @@
|
|||
</property>
|
||||
<property name="Toplevel" attrib="0" ptype="Gtk.Window" params="Gtk.Window">
|
||||
<methods>
|
||||
<method name="set_Toplevel(Gtk.Window)" returntype="System.Void">
|
||||
<method name="set_Toplevel(Gtk.Window)" attrib="2182" returntype="System.Void">
|
||||
<parameters>
|
||||
<parameter name="value" position="0" attrib="0" type="Gtk.Window" />
|
||||
</parameters>
|
||||
|
|
@ -780,10 +780,10 @@
|
|||
<method name="EnsureAccel()" attrib="134" returntype="Gtk.AccelGroup">
|
||||
<parameters />
|
||||
</method>
|
||||
<method name="Finalize()" attrib="196" returntype="System.Void">
|
||||
<method name="Finalize()" attrib="196" virtual="true" returntype="System.Void">
|
||||
<parameters />
|
||||
</method>
|
||||
<method name="FromAssembly(System.Reflection.Assembly, System.String, System.String, System.String)" attrib="150" returntype="Glade.XML">
|
||||
<method name="FromAssembly(System.Reflection.Assembly, System.String, System.String, System.String)" attrib="150" static="true" returntype="Glade.XML">
|
||||
<parameters>
|
||||
<parameter name="assembly" position="0" attrib="0" type="System.Reflection.Assembly" />
|
||||
<parameter name="resource_name" position="1" attrib="0" type="System.String" />
|
||||
|
|
@ -791,14 +791,14 @@
|
|||
<parameter name="domain" position="3" attrib="0" type="System.String" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="FromAssembly(System.String, System.String, System.String)" attrib="150" returntype="Glade.XML">
|
||||
<method name="FromAssembly(System.String, System.String, System.String)" attrib="150" static="true" returntype="Glade.XML">
|
||||
<parameters>
|
||||
<parameter name="resource_name" position="0" attrib="0" type="System.String" />
|
||||
<parameter name="root" position="1" attrib="0" type="System.String" />
|
||||
<parameter name="domain" position="2" attrib="0" type="System.String" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="FromStream(System.IO.Stream, System.String, System.String)" attrib="150" returntype="Glade.XML">
|
||||
<method name="FromStream(System.IO.Stream, System.String, System.String)" attrib="150" static="true" returntype="Glade.XML">
|
||||
<parameters>
|
||||
<parameter name="stream" position="0" attrib="0" type="System.IO.Stream" />
|
||||
<parameter name="root" position="1" attrib="0" type="System.String" />
|
||||
|
|
@ -810,7 +810,7 @@
|
|||
<parameter name="name" position="0" attrib="0" type="System.String" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetWidgetName(Gtk.Widget)" attrib="150" returntype="System.String">
|
||||
<method name="GetWidgetName(Gtk.Widget)" attrib="150" static="true" returntype="System.String">
|
||||
<parameters>
|
||||
<parameter name="w" position="0" attrib="0" type="Gtk.Widget" />
|
||||
</parameters>
|
||||
|
|
@ -820,7 +820,7 @@
|
|||
<parameter name="name" position="0" attrib="0" type="System.String" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="GetWidgetTree(Gtk.Widget)" attrib="150" returntype="Glade.XML">
|
||||
<method name="GetWidgetTree(Gtk.Widget)" attrib="150" static="true" returntype="Glade.XML">
|
||||
<parameters>
|
||||
<parameter name="w" position="0" attrib="0" type="Gtk.Widget" />
|
||||
</parameters>
|
||||
|
|
@ -849,7 +849,7 @@
|
|||
<parameter name="info" position="1" attrib="0" type="Glade.WidgetInfo" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="SetCustomHandler(Glade.XMLCustomWidgetHandler)" attrib="150" returntype="System.Void">
|
||||
<method name="SetCustomHandler(Glade.XMLCustomWidgetHandler)" attrib="150" static="true" returntype="System.Void">
|
||||
<attributes>
|
||||
<attribute name="System.ObsoleteAttribute">
|
||||
<properties>
|
||||
|
|
@ -899,7 +899,7 @@
|
|||
<interface name="System.Runtime.Serialization.ISerializable" />
|
||||
</interfaces>
|
||||
<constructors>
|
||||
<constructor name=".ctor(System.Object, System.IntPtr)" attrib="6278">
|
||||
<constructor name=".ctor(System.Object, System.IntPtr)" attrib="2182">
|
||||
<parameters>
|
||||
<parameter name="object" position="0" attrib="0" type="System.Object" />
|
||||
<parameter name="method" position="1" attrib="0" type="System.IntPtr" />
|
||||
|
|
@ -907,7 +907,7 @@
|
|||
</constructor>
|
||||
</constructors>
|
||||
<methods>
|
||||
<method name="BeginInvoke(System.String, GLib.Object, System.String, System.String, GLib.Object, System.Boolean, System.AsyncCallback, System.Object)" attrib="454" returntype="System.IAsyncResult">
|
||||
<method name="BeginInvoke(System.String, GLib.Object, System.String, System.String, GLib.Object, System.Boolean, System.AsyncCallback, System.Object)" attrib="454" virtual="true" returntype="System.IAsyncResult">
|
||||
<parameters>
|
||||
<parameter name="handler_name" position="0" attrib="0" type="System.String" />
|
||||
<parameter name="objekt" position="1" attrib="0" type="GLib.Object" />
|
||||
|
|
@ -919,12 +919,12 @@
|
|||
<parameter name="object" position="7" attrib="0" type="System.Object" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="EndInvoke(System.IAsyncResult)" attrib="454" returntype="System.Void">
|
||||
<method name="EndInvoke(System.IAsyncResult)" attrib="454" virtual="true" returntype="System.Void">
|
||||
<parameters>
|
||||
<parameter name="result" position="0" attrib="0" type="System.IAsyncResult" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="Invoke(System.String, GLib.Object, System.String, System.String, GLib.Object, System.Boolean)" attrib="454" returntype="System.Void">
|
||||
<method name="Invoke(System.String, GLib.Object, System.String, System.String, GLib.Object, System.Boolean)" attrib="454" virtual="true" returntype="System.Void">
|
||||
<parameters>
|
||||
<parameter name="handler_name" position="0" attrib="0" type="System.String" />
|
||||
<parameter name="objekt" position="1" attrib="0" type="GLib.Object" />
|
||||
|
|
@ -942,7 +942,7 @@
|
|||
<interface name="System.Runtime.Serialization.ISerializable" />
|
||||
</interfaces>
|
||||
<constructors>
|
||||
<constructor name=".ctor(System.Object, System.IntPtr)" attrib="6278">
|
||||
<constructor name=".ctor(System.Object, System.IntPtr)" attrib="2182">
|
||||
<parameters>
|
||||
<parameter name="object" position="0" attrib="0" type="System.Object" />
|
||||
<parameter name="method" position="1" attrib="0" type="System.IntPtr" />
|
||||
|
|
@ -950,7 +950,7 @@
|
|||
</constructor>
|
||||
</constructors>
|
||||
<methods>
|
||||
<method name="BeginInvoke(Glade.XML, System.String, System.String, System.String, System.String, System.Int32, System.Int32, System.AsyncCallback, System.Object)" attrib="454" returntype="System.IAsyncResult">
|
||||
<method name="BeginInvoke(Glade.XML, System.String, System.String, System.String, System.String, System.Int32, System.Int32, System.AsyncCallback, System.Object)" attrib="454" virtual="true" returntype="System.IAsyncResult">
|
||||
<parameters>
|
||||
<parameter name="xml" position="0" attrib="0" type="Glade.XML" />
|
||||
<parameter name="func_name" position="1" attrib="0" type="System.String" />
|
||||
|
|
@ -963,12 +963,12 @@
|
|||
<parameter name="object" position="8" attrib="0" type="System.Object" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="EndInvoke(System.IAsyncResult)" attrib="454" returntype="Gtk.Widget">
|
||||
<method name="EndInvoke(System.IAsyncResult)" attrib="454" virtual="true" returntype="Gtk.Widget">
|
||||
<parameters>
|
||||
<parameter name="result" position="0" attrib="0" type="System.IAsyncResult" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="Invoke(Glade.XML, System.String, System.String, System.String, System.String, System.Int32, System.Int32)" attrib="454" returntype="Gtk.Widget">
|
||||
<method name="Invoke(Glade.XML, System.String, System.String, System.String, System.String, System.Int32, System.Int32)" attrib="454" virtual="true" returntype="Gtk.Widget">
|
||||
<parameters>
|
||||
<parameter name="xml" position="0" attrib="0" type="Glade.XML" />
|
||||
<parameter name="func_name" position="1" attrib="0" type="System.String" />
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -18,13 +18,13 @@
|
|||
<classes>
|
||||
<class name="Graphics" type="class" base="System.Object" charset="Ansi" layout="Auto">
|
||||
<methods>
|
||||
<method name="FromDrawable(Gdk.Drawable, System.Boolean)" attrib="150" returntype="System.Drawing.Graphics">
|
||||
<method name="FromDrawable(Gdk.Drawable, System.Boolean)" attrib="150" static="true" returntype="System.Drawing.Graphics">
|
||||
<parameters>
|
||||
<parameter name="drawable" position="0" attrib="0" type="Gdk.Drawable" />
|
||||
<parameter name="double_buffered" position="1" attrib="0" type="System.Boolean" />
|
||||
</parameters>
|
||||
</method>
|
||||
<method name="FromDrawable(Gdk.Drawable)" attrib="150" returntype="System.Drawing.Graphics">
|
||||
<method name="FromDrawable(Gdk.Drawable)" attrib="150" static="true" returntype="System.Drawing.Graphics">
|
||||
<parameters>
|
||||
<parameter name="drawable" position="0" attrib="0" type="Gdk.Drawable" />
|
||||
</parameters>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -56,7 +56,7 @@ namespace GtkSharp.Auditing {
|
|||
else if (node.ParentNode.ParentNode.Name == "class")
|
||||
Console.WriteLine ("Missing " + node.Name + " " + (node.ParentNode.ParentNode as XmlElement).GetAttribute ("name") + "." + node.GetAttribute ("name"));
|
||||
else
|
||||
Console.WriteLine ("oopsie: " + node.Name);
|
||||
Console.WriteLine ("oopsie: " + node.Name + " " + node.ParentNode.ParentNode.Name);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -292,7 +292,8 @@ namespace Mono.AssemblyCompare
|
|||
string name = n.Attributes ["name"].Value;
|
||||
if (CheckIfAdd (name, n)) {
|
||||
string key = GetNodeKey (name, n);
|
||||
keys.Add (key, name);
|
||||
//keys.Add (key, name);
|
||||
keys [key] = name;
|
||||
LoadExtraData (key, n);
|
||||
}
|
||||
}
|
||||
|
|
@ -628,6 +629,7 @@ namespace Mono.AssemblyCompare
|
|||
string layout;
|
||||
XMLAttributes attributes;
|
||||
XMLInterfaces interfaces;
|
||||
XMLGenericTypeConstraints genericConstraints;
|
||||
XMLFields fields;
|
||||
XMLConstructors constructors;
|
||||
XMLProperties properties;
|
||||
|
|
@ -681,6 +683,12 @@ namespace Mono.AssemblyCompare
|
|||
child = child.NextSibling;
|
||||
}
|
||||
|
||||
if (child != null && child.Name == "generic-type-constraints") {
|
||||
genericConstraints = new XMLGenericTypeConstraints ();
|
||||
genericConstraints.LoadData (child);
|
||||
child = child.NextSibling;
|
||||
}
|
||||
|
||||
if (child != null && child.Name == "fields") {
|
||||
fields = new XMLFields ();
|
||||
fields.LoadData (child);
|
||||
|
|
@ -775,6 +783,14 @@ namespace Mono.AssemblyCompare
|
|||
counters.AddPartialToPartial (interfaces.Counters);
|
||||
}
|
||||
|
||||
if (genericConstraints != null || oclass.genericConstraints != null) {
|
||||
if (genericConstraints == null)
|
||||
genericConstraints = new XMLGenericTypeConstraints ();
|
||||
|
||||
genericConstraints.CompareTo (doc, parent, oclass.genericConstraints);
|
||||
counters.AddPartialToPartial (genericConstraints.Counters);
|
||||
}
|
||||
|
||||
if (fields != null || oclass.fields != null) {
|
||||
if (fields == null)
|
||||
fields = new XMLFields ();
|
||||
|
|
@ -983,8 +999,8 @@ namespace Mono.AssemblyCompare
|
|||
this.attribute = attribute;
|
||||
}
|
||||
|
||||
public override void LoadData(XmlNode node)
|
||||
{
|
||||
public override void LoadData(XmlNode node)
|
||||
{
|
||||
if (node == null)
|
||||
throw new ArgumentNullException ("node");
|
||||
|
||||
|
|
@ -1004,42 +1020,42 @@ namespace Mono.AssemblyCompare
|
|||
}
|
||||
string value = n.Attributes ["value"].Value;
|
||||
properties.Add (name, value);
|
||||
}
|
||||
}
|
||||
|
||||
public override void CompareTo (XmlDocument doc, XmlNode parent, object other)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
public override void CompareTo (XmlDocument doc, XmlNode parent, object other)
|
||||
{
|
||||
this.document = doc;
|
||||
|
||||
Hashtable other_properties = ((XMLAttributeProperties)other).properties;
|
||||
foreach (DictionaryEntry de in other_properties) {
|
||||
object other_value = properties [de.Key];
|
||||
|
||||
if (de.Value == null) {
|
||||
if (other_value != null)
|
||||
AddWarning (parent, "Property '{0}' is 'null' and should be '{1}'", de.Key, other_value);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (de.Value.Equals (other_value))
|
||||
continue;
|
||||
|
||||
AddWarning (parent, "Property '{0}' is '{1}' and should be '{2}'",
|
||||
de.Key, de.Value, other_value == null ? "null" : other_value);
|
||||
}
|
||||
}
|
||||
|
||||
public override string GroupName {
|
||||
get {
|
||||
return "properties";
|
||||
}
|
||||
}
|
||||
|
||||
public override string Name {
|
||||
get {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
Hashtable other_properties = ((XMLAttributeProperties)other).properties;
|
||||
foreach (DictionaryEntry de in other_properties) {
|
||||
object other_value = properties [de.Key];
|
||||
|
||||
if (de.Value == null) {
|
||||
if (other_value != null)
|
||||
AddWarning (parent, "Property '{0}' is 'null' and should be '{1}'", de.Key, other_value);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (de.Value.Equals (other_value))
|
||||
continue;
|
||||
|
||||
AddWarning (parent, "Property '{0}' is '{1}' and should be '{2}'",
|
||||
de.Key, de.Value, other_value == null ? "null" : other_value);
|
||||
}
|
||||
}
|
||||
|
||||
public override string GroupName {
|
||||
get {
|
||||
return "properties";
|
||||
}
|
||||
}
|
||||
|
||||
public override string Name {
|
||||
get {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class XMLAttributes : XMLNameGroup
|
||||
|
|
@ -1064,32 +1080,62 @@ namespace Mono.AssemblyCompare
|
|||
return true;
|
||||
}
|
||||
|
||||
protected override void CompareToInner (string name, XmlNode node, XMLNameGroup other)
|
||||
{
|
||||
XMLAttributeProperties other_prop = ((XMLAttributes)other).properties [name] as XMLAttributeProperties;
|
||||
XMLAttributeProperties this_prop = properties [name] as XMLAttributeProperties;
|
||||
if (other_prop == null || this_prop == null)
|
||||
return;
|
||||
|
||||
this_prop.CompareTo (document, node, other_prop);
|
||||
counters.AddPartialToPartial (this_prop.Counters);
|
||||
}
|
||||
|
||||
public override string GetNodeKey (string name, XmlNode node)
|
||||
protected override void CompareToInner (string name, XmlNode node, XMLNameGroup other)
|
||||
{
|
||||
string target = string.Empty;
|
||||
if (node.Attributes["target"] != null)
|
||||
target = node.Attributes["target"].Value;
|
||||
int i = 0;
|
||||
while (keys.ContainsKey (name)) {
|
||||
name = String.Format ("{0} [{1}]:{1}", name, target, i++);
|
||||
}
|
||||
XMLAttributeProperties other_prop = ((XMLAttributes)other).properties [name] as XMLAttributeProperties;
|
||||
XMLAttributeProperties this_prop = properties [name] as XMLAttributeProperties;
|
||||
if (other_prop == null || this_prop == null)
|
||||
return;
|
||||
|
||||
return name;
|
||||
this_prop.CompareTo (document, node, other_prop);
|
||||
counters.AddPartialToPartial (this_prop.Counters);
|
||||
}
|
||||
|
||||
protected override void LoadExtraData(string name, XmlNode node)
|
||||
{
|
||||
public override string GetNodeKey (string name, XmlNode node)
|
||||
{
|
||||
string key = null;
|
||||
|
||||
// if multiple attributes with the same name (type) exist, then we
|
||||
// cannot be sure which attributes correspond, so we must use the
|
||||
// name of the attribute (type) and the name/value of its properties
|
||||
// as key
|
||||
|
||||
XmlNodeList attributes = node.ParentNode.SelectNodes("attribute[@name='" + name + "']");
|
||||
if (attributes.Count > 1) {
|
||||
ArrayList keyParts = new ArrayList ();
|
||||
|
||||
XmlNodeList properties = node.SelectNodes ("properties/property");
|
||||
foreach (XmlNode property in properties) {
|
||||
XmlAttributeCollection attrs = property.Attributes;
|
||||
if (attrs["value"] != null) {
|
||||
keyParts.Add (attrs["name"].Value + "=" + attrs["value"].Value);
|
||||
} else {
|
||||
keyParts.Add (attrs["name"].Value + "=");
|
||||
}
|
||||
}
|
||||
|
||||
// sort properties by name, as order of properties in XML is
|
||||
// undefined
|
||||
keyParts.Sort ();
|
||||
|
||||
// insert name (type) of attribute
|
||||
keyParts.Insert (0, name);
|
||||
|
||||
StringBuilder sb = new StringBuilder ();
|
||||
foreach (string value in keyParts) {
|
||||
sb.Append (value);
|
||||
sb.Append (';');
|
||||
}
|
||||
key = sb.ToString ();
|
||||
} else {
|
||||
key = name;
|
||||
}
|
||||
|
||||
return key;
|
||||
}
|
||||
|
||||
protected override void LoadExtraData(string name, XmlNode node)
|
||||
{
|
||||
XmlNode pNode = node.SelectSingleNode ("properties");
|
||||
|
||||
if (name.EndsWith ("TODOAttribute")) {
|
||||
|
|
@ -1105,9 +1151,8 @@ namespace Mono.AssemblyCompare
|
|||
p.LoadData (pNode);
|
||||
|
||||
properties[name] = p;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public override string GroupName {
|
||||
get { return "attributes"; }
|
||||
|
|
@ -1137,6 +1182,47 @@ namespace Mono.AssemblyCompare
|
|||
}
|
||||
}
|
||||
|
||||
abstract class XMLGenericGroup : XMLNameGroup
|
||||
{
|
||||
string attributes;
|
||||
|
||||
protected override void LoadExtraData (string name, XmlNode node)
|
||||
{
|
||||
attributes = ((XmlElement) node).GetAttribute ("generic-attribute");
|
||||
}
|
||||
|
||||
protected override void CompareToInner (string name, XmlNode parent, XMLNameGroup other)
|
||||
{
|
||||
base.CompareToInner (name, parent, other);
|
||||
|
||||
XMLGenericGroup g = (XMLGenericGroup) other;
|
||||
if (attributes != g.attributes)
|
||||
AddWarning (parent, "Incorrect generic attributes: '{0}' != '{1}'", attributes, g.attributes);
|
||||
}
|
||||
}
|
||||
|
||||
class XMLGenericTypeConstraints : XMLGenericGroup
|
||||
{
|
||||
public override string GroupName {
|
||||
get { return "generic-type-constraints"; }
|
||||
}
|
||||
|
||||
public override string Name {
|
||||
get { return "generic-type-constraint"; }
|
||||
}
|
||||
}
|
||||
|
||||
class XMLGenericMethodConstraints : XMLGenericGroup
|
||||
{
|
||||
public override string GroupName {
|
||||
get { return "generic-method-constraints"; }
|
||||
}
|
||||
|
||||
public override string Name {
|
||||
get { return "generic-method-constraint"; }
|
||||
}
|
||||
}
|
||||
|
||||
abstract class XMLMember : XMLNameGroup
|
||||
{
|
||||
Hashtable attributeMap;
|
||||
|
|
@ -1194,9 +1280,6 @@ namespace Mono.AssemblyCompare
|
|||
}
|
||||
}
|
||||
|
||||
if (!CheckAttributes)
|
||||
return;
|
||||
|
||||
XMLMember member = (XMLMember) other;
|
||||
string acc = access [name] as string;
|
||||
if (acc == null)
|
||||
|
|
@ -1219,12 +1302,6 @@ namespace Mono.AssemblyCompare
|
|||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
protected virtual bool CheckAttributes {
|
||||
get {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class XMLFields : XMLMember
|
||||
|
|
@ -1283,14 +1360,6 @@ namespace Mono.AssemblyCompare
|
|||
return fa.ToString ();
|
||||
}
|
||||
|
||||
protected override bool CheckAttributes {
|
||||
get {
|
||||
// FIXME: set this to true once bugs #60086 and
|
||||
// #60090 are fixed
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public override string GroupName {
|
||||
get { return "fields"; }
|
||||
}
|
||||
|
|
@ -1513,6 +1582,17 @@ namespace Mono.AssemblyCompare
|
|||
{
|
||||
Hashtable returnTypes;
|
||||
Hashtable parameters;
|
||||
Hashtable genericConstraints;
|
||||
Hashtable signatureFlags;
|
||||
|
||||
[Flags]
|
||||
enum SignatureFlags
|
||||
{
|
||||
None = 0,
|
||||
Abstract = 1,
|
||||
Virtual = 2,
|
||||
Static = 4
|
||||
}
|
||||
|
||||
protected override void LoadExtraData (string name, XmlNode node)
|
||||
{
|
||||
|
|
@ -1524,6 +1604,19 @@ namespace Mono.AssemblyCompare
|
|||
returnTypes [name] = xatt.Value;
|
||||
}
|
||||
|
||||
SignatureFlags flags = SignatureFlags.None;
|
||||
if (((XmlElement) node).GetAttribute ("abstract") == "true")
|
||||
flags |= SignatureFlags.Abstract;
|
||||
if (((XmlElement) node).GetAttribute ("static") == "true")
|
||||
flags |= SignatureFlags.Static;
|
||||
if (((XmlElement) node).GetAttribute ("virtual") == "true")
|
||||
flags |= SignatureFlags.Virtual;
|
||||
if (flags != SignatureFlags.None) {
|
||||
if (signatureFlags == null)
|
||||
signatureFlags = new Hashtable ();
|
||||
signatureFlags [name] = flags;
|
||||
}
|
||||
|
||||
XmlNode parametersNode = node.SelectSingleNode ("parameters");
|
||||
if (parametersNode != null) {
|
||||
if (parameters == null)
|
||||
|
|
@ -1535,6 +1628,15 @@ namespace Mono.AssemblyCompare
|
|||
parameters[name] = parms;
|
||||
}
|
||||
|
||||
XmlNode genericNode = node.SelectSingleNode ("generic-method-constraints");
|
||||
if (genericNode != null) {
|
||||
if (genericConstraints == null)
|
||||
genericConstraints = new Hashtable ();
|
||||
XMLGenericMethodConstraints csts = new XMLGenericMethodConstraints ();
|
||||
csts.LoadData (genericNode);
|
||||
genericConstraints [name] = csts;
|
||||
}
|
||||
|
||||
base.LoadExtraData (name, node);
|
||||
}
|
||||
|
||||
|
|
@ -1548,6 +1650,25 @@ namespace Mono.AssemblyCompare
|
|||
try {
|
||||
base.CompareToInner(name, parent, other);
|
||||
XMLMethods methods = (XMLMethods) other;
|
||||
|
||||
SignatureFlags flags = signatureFlags != null &&
|
||||
signatureFlags.ContainsKey (name) ?
|
||||
(SignatureFlags) signatureFlags [name] :
|
||||
SignatureFlags.None;
|
||||
SignatureFlags oflags = methods.signatureFlags != null &&
|
||||
methods.signatureFlags.ContainsKey (name) ?
|
||||
(SignatureFlags) methods.signatureFlags [name] :
|
||||
SignatureFlags.None;
|
||||
|
||||
if (flags!= oflags) {
|
||||
if (flags == SignatureFlags.None)
|
||||
AddWarning (parent, String.Format ("should not be {0}", oflags));
|
||||
else if (oflags == SignatureFlags.None)
|
||||
AddWarning (parent, String.Format ("should be {0}", flags));
|
||||
else
|
||||
AddWarning (parent, String.Format ("{0} and should be {1}", oflags, flags));
|
||||
}
|
||||
|
||||
if (returnTypes != null) {
|
||||
string rtype = returnTypes[name] as string;
|
||||
string ortype = null;
|
||||
|
|
@ -1577,6 +1698,12 @@ namespace Mono.AssemblyCompare
|
|||
protected override string ConvertToString (int att)
|
||||
{
|
||||
MethodAttributes ma = (MethodAttributes) att;
|
||||
// ignore ReservedMasks
|
||||
ma &= ~ MethodAttributes.ReservedMask;
|
||||
ma &= ~ MethodAttributes.VtableLayoutMask;
|
||||
if ((ma & MethodAttributes.FamORAssem) != 0)
|
||||
ma = (ma & ~ MethodAttributes.FamORAssem) | MethodAttributes.Family;
|
||||
|
||||
// ignore the HasSecurity attribute for now
|
||||
if ((ma & MethodAttributes.HasSecurity) != 0)
|
||||
ma = (MethodAttributes) (att - (int) MethodAttributes.HasSecurity);
|
||||
|
|
@ -1592,14 +1719,6 @@ namespace Mono.AssemblyCompare
|
|||
return ma.ToString ();
|
||||
}
|
||||
|
||||
protected override bool CheckAttributes {
|
||||
get {
|
||||
// FIXME: set this to true once bugs #60086 and
|
||||
// #60090 are fixed
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public override string GroupName {
|
||||
get { return "methods"; }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ namespace Mono.AssemblyInfo
|
|||
AddAttribute (nclass, "type", classType);
|
||||
|
||||
if (type.BaseType != null)
|
||||
AddAttribute (nclass, "base", type.BaseType.FullName);
|
||||
AddAttribute (nclass, "base", type.BaseType.ToString ());
|
||||
|
||||
if (type.IsSealed)
|
||||
AddAttribute (nclass, "sealed", "true");
|
||||
|
|
@ -297,11 +297,35 @@ namespace Mono.AssemblyInfo
|
|||
continue;
|
||||
}
|
||||
XmlNode iface = document.CreateElement ("interface", null);
|
||||
AddAttribute (iface, "name", t.FullName);
|
||||
AddAttribute (iface, "name", t.ToString ());
|
||||
ifaces.AppendChild (iface);
|
||||
}
|
||||
}
|
||||
|
||||
#if NET_2_0
|
||||
// Generic constraints
|
||||
Type [] gargs = type.GetGenericArguments ();
|
||||
XmlElement ngeneric = (gargs.Length == 0) ? null :
|
||||
document.CreateElement ("generic-type-constraints");
|
||||
foreach (Type garg in gargs) {
|
||||
Type [] csts = garg.GetGenericParameterConstraints ();
|
||||
if (csts.Length == 0 || csts [0] == typeof (object))
|
||||
continue;
|
||||
XmlElement el = document.CreateElement ("generic-type-constraint");
|
||||
el.SetAttribute ("name", garg.ToString ());
|
||||
el.SetAttribute ("generic-attribute",
|
||||
garg.GenericParameterAttributes.ToString ());
|
||||
ngeneric.AppendChild (el);
|
||||
foreach (Type ct in csts) {
|
||||
XmlElement cel = document.CreateElement ("type");
|
||||
cel.AppendChild (document.CreateTextNode (ct.FullName));
|
||||
el.AppendChild (cel);
|
||||
}
|
||||
}
|
||||
if (ngeneric != null && ngeneric.FirstChild != null)
|
||||
nclass.AppendChild (ngeneric);
|
||||
#endif
|
||||
|
||||
ArrayList members = new ArrayList ();
|
||||
|
||||
FieldInfo[] fields = GetFields (type);
|
||||
|
|
@ -310,7 +334,7 @@ namespace Mono.AssemblyInfo
|
|||
FieldData fd = new FieldData (document, nclass, fields);
|
||||
// Special case for enum fields
|
||||
if (classType == "enum") {
|
||||
string etype = fields [0].GetType ().FullName;
|
||||
string etype = fields [0].GetType ().ToString ();
|
||||
AddAttribute (nclass, "enumtype", etype);
|
||||
}
|
||||
members.Add (fd);
|
||||
|
|
@ -541,7 +565,7 @@ namespace Mono.AssemblyInfo
|
|||
{
|
||||
base.AddExtraData (p, member);
|
||||
FieldInfo field = (FieldInfo) member;
|
||||
AddAttribute (p, "fieldtype", field.FieldType.FullName);
|
||||
AddAttribute (p, "fieldtype", field.FieldType.ToString ());
|
||||
|
||||
if (field.IsLiteral) {
|
||||
object value = field.GetValue (null);
|
||||
|
|
@ -586,7 +610,8 @@ namespace Mono.AssemblyInfo
|
|||
{
|
||||
base.AddExtraData (p, member);
|
||||
PropertyInfo prop = (PropertyInfo) member;
|
||||
AddAttribute (p, "ptype", prop.PropertyType.FullName);
|
||||
Type t = prop.PropertyType;
|
||||
AddAttribute (p, "ptype", prop.PropertyType.ToString ());
|
||||
MethodInfo _get = prop.GetGetMethod (true);
|
||||
MethodInfo _set = prop.GetSetMethod (true);
|
||||
bool haveGet = (_get != null && TypeData.MustDocumentMethod(_get));
|
||||
|
|
@ -608,14 +633,14 @@ namespace Mono.AssemblyInfo
|
|||
AddAttribute (p, "params", parms);
|
||||
|
||||
MethodData data = new MethodData (document, p, methods);
|
||||
data.NoMemberAttributes = true;
|
||||
//data.NoMemberAttributes = true;
|
||||
data.DoOutput ();
|
||||
}
|
||||
|
||||
protected override string GetMemberAttributes (MemberInfo member)
|
||||
{
|
||||
PropertyInfo prop = (PropertyInfo) member;
|
||||
return ((int) prop.Attributes).ToString (CultureInfo.InvariantCulture);
|
||||
return ((int) prop.Attributes & (0xFFFFFFFF ^ (int) PropertyAttributes.ReservedMask)).ToString (CultureInfo.InvariantCulture);
|
||||
}
|
||||
|
||||
public override string ParentTag {
|
||||
|
|
@ -650,7 +675,7 @@ namespace Mono.AssemblyInfo
|
|||
{
|
||||
base.AddExtraData (p, member);
|
||||
EventInfo evt = (EventInfo) member;
|
||||
AddAttribute (p, "eventtype", evt.EventHandlerType.FullName);
|
||||
AddAttribute (p, "eventtype", evt.EventHandlerType.ToString ());
|
||||
}
|
||||
|
||||
public override string ParentTag {
|
||||
|
|
@ -676,13 +701,47 @@ namespace Mono.AssemblyInfo
|
|||
MethodBase method = (MethodBase) member;
|
||||
string name = method.Name;
|
||||
string parms = Parameters.GetSignature (method.GetParameters ());
|
||||
#if NET_2_0
|
||||
MethodInfo mi = method as MethodInfo;
|
||||
Type [] genArgs = mi == null ? Type.EmptyTypes :
|
||||
mi.GetGenericArguments ();
|
||||
if (genArgs.Length > 0) {
|
||||
string [] genArgNames = new string [genArgs.Length];
|
||||
for (int i = 0; i < genArgs.Length; i++) {
|
||||
genArgNames [i] = genArgs [i].Name;
|
||||
string genArgCsts = String.Empty;
|
||||
Type [] gcs = genArgs [i].GetGenericParameterConstraints ();
|
||||
if (gcs.Length > 0) {
|
||||
string [] gcNames = new string [gcs.Length];
|
||||
for (int g = 0; g < gcs.Length; g++)
|
||||
gcNames [g] = gcs [g].FullName;
|
||||
genArgCsts = String.Concat (
|
||||
"(",
|
||||
string.Join (", ", gcNames),
|
||||
") ",
|
||||
genArgNames [i]);
|
||||
}
|
||||
else
|
||||
genArgCsts = genArgNames [i];
|
||||
if ((genArgs [i].GenericParameterAttributes & GenericParameterAttributes.ReferenceTypeConstraint) != 0)
|
||||
genArgCsts = "class " + genArgCsts;
|
||||
else if ((genArgs [i].GenericParameterAttributes & GenericParameterAttributes.NotNullableValueTypeConstraint) != 0)
|
||||
genArgCsts = "struct " + genArgCsts;
|
||||
genArgNames [i] = genArgCsts;
|
||||
}
|
||||
return String.Format ("{0}<{2}>({1})",
|
||||
name,
|
||||
parms,
|
||||
string.Join (",", genArgNames));
|
||||
}
|
||||
#endif
|
||||
return String.Format ("{0}({1})", name, parms);
|
||||
}
|
||||
|
||||
protected override string GetMemberAttributes (MemberInfo member)
|
||||
{
|
||||
MethodBase method = (MethodBase) member;
|
||||
return ((int) method.Attributes).ToString (CultureInfo.InvariantCulture);
|
||||
return ((int)( method.Attributes & ~MethodAttributes.ReservedMask)).ToString (CultureInfo.InvariantCulture);
|
||||
}
|
||||
|
||||
protected override void AddExtraData (XmlNode p, MemberInfo member)
|
||||
|
|
@ -693,14 +752,50 @@ namespace Mono.AssemblyInfo
|
|||
((MethodBase) member).GetParameters ());
|
||||
parms.DoOutput ();
|
||||
|
||||
if (!(member is MethodBase))
|
||||
return;
|
||||
|
||||
MethodBase mbase = (MethodBase) member;
|
||||
|
||||
if (mbase.IsAbstract)
|
||||
AddAttribute (p, "abstract", "true");
|
||||
if (mbase.IsVirtual)
|
||||
AddAttribute (p, "virtual", "true");
|
||||
if (mbase.IsStatic)
|
||||
AddAttribute (p, "static", "true");
|
||||
|
||||
if (!(member is MethodInfo))
|
||||
return;
|
||||
|
||||
MethodInfo method = (MethodInfo) member;
|
||||
AddAttribute (p, "returntype", method.ReturnType.FullName);
|
||||
AddAttribute (p, "returntype", method.ReturnType.ToString ());
|
||||
|
||||
AttributeData.OutputAttributes (document, p,
|
||||
method.ReturnTypeCustomAttributes.GetCustomAttributes (false));
|
||||
#if NET_2_0
|
||||
// Generic constraints
|
||||
Type [] gargs = method.GetGenericArguments ();
|
||||
XmlElement ngeneric = (gargs.Length == 0) ? null :
|
||||
document.CreateElement ("generic-method-constraints");
|
||||
foreach (Type garg in gargs) {
|
||||
Type [] csts = garg.GetGenericParameterConstraints ();
|
||||
if (csts.Length == 0 || csts [0] == typeof (object))
|
||||
continue;
|
||||
XmlElement el = document.CreateElement ("generic-method-constraint");
|
||||
el.SetAttribute ("name", garg.ToString ());
|
||||
el.SetAttribute ("generic-attribute",
|
||||
garg.GenericParameterAttributes.ToString ());
|
||||
ngeneric.AppendChild (el);
|
||||
foreach (Type ct in csts) {
|
||||
XmlElement cel = document.CreateElement ("type");
|
||||
cel.AppendChild (document.CreateTextNode (ct.FullName));
|
||||
el.AppendChild (cel);
|
||||
}
|
||||
}
|
||||
if (ngeneric != null && ngeneric.FirstChild != null)
|
||||
p.AppendChild (ngeneric);
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
public override bool NoMemberAttributes {
|
||||
|
|
@ -762,7 +857,7 @@ namespace Mono.AssemblyInfo
|
|||
}
|
||||
|
||||
Type t = parameter.ParameterType;
|
||||
AddAttribute (paramNode, "type", t.FullName);
|
||||
AddAttribute (paramNode, "type", t.ToString ());
|
||||
|
||||
if (parameter.IsOptional) {
|
||||
AddAttribute (paramNode, "optional", "true");
|
||||
|
|
@ -781,18 +876,11 @@ namespace Mono.AssemblyInfo
|
|||
class AttributeData : BaseData
|
||||
{
|
||||
object [] atts;
|
||||
string target;
|
||||
|
||||
AttributeData (XmlDocument doc, XmlNode parent, object[] attributes, string target)
|
||||
AttributeData (XmlDocument doc, XmlNode parent, object[] attributes)
|
||||
: base (doc, parent)
|
||||
{
|
||||
atts = attributes;
|
||||
this.target = target;
|
||||
}
|
||||
|
||||
AttributeData (XmlDocument doc, XmlNode parent, object [] attributes)
|
||||
: this (doc, parent, attributes, null)
|
||||
{
|
||||
}
|
||||
|
||||
public override void DoOutput ()
|
||||
|
|
@ -822,7 +910,7 @@ namespace Mono.AssemblyInfo
|
|||
continue;
|
||||
|
||||
XmlNode node = document.CreateElement ("attribute");
|
||||
AddAttribute (node, "name", t.FullName);
|
||||
AddAttribute (node, "name", t.ToString ());
|
||||
|
||||
XmlNode properties = null;
|
||||
foreach (PropertyInfo pi in TypeData.GetProperties (t)) {
|
||||
|
|
@ -855,23 +943,13 @@ namespace Mono.AssemblyInfo
|
|||
}
|
||||
}
|
||||
|
||||
if (target != null) {
|
||||
AddAttribute (node, "target", target);
|
||||
}
|
||||
|
||||
natts.AppendChild (node);
|
||||
}
|
||||
}
|
||||
|
||||
public static void OutputAttributes (XmlDocument doc, XmlNode parent, object[] attributes)
|
||||
{
|
||||
AttributeData ad = new AttributeData (doc, parent, attributes, null);
|
||||
ad.DoOutput ();
|
||||
}
|
||||
|
||||
public static void OutputAttributes (XmlDocument doc, XmlNode parent, object [] attributes, string target)
|
||||
{
|
||||
AttributeData ad = new AttributeData (doc, parent, attributes, target);
|
||||
AttributeData ad = new AttributeData (doc, parent, attributes);
|
||||
ad.DoOutput ();
|
||||
}
|
||||
|
||||
|
|
@ -903,7 +981,7 @@ namespace Mono.AssemblyInfo
|
|||
else
|
||||
modifier = "";
|
||||
|
||||
string type_name = info.ParameterType.ToString ();
|
||||
string type_name = info.ParameterType.ToString ().Replace ('<', '[').Replace ('>', ']');
|
||||
sb.AppendFormat ("{0}{1}, ", modifier, type_name);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue