reverting to a less broken state for now

svn path=/trunk/gtk-sharp/; revision=44421

doc/en/Gtk/Object.xml

@@ -451,17 +451,5 @@ The object is only destroyed if all the references to the object are released, t
         </remarks>
       </Docs>
     </Member>
-    <Member MemberName="Dispose">
-      <MemberSignature Language="C#" Value="public override void Dispose ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Disposes the object's resources.</summary>
-        <remarks />
-      </Docs>
-    </Member>
   </Members>
 </Type>

gtk/Object.custom

@@ -32,9 +32,10 @@
 
 		static void NativeDestroy (object o, EventArgs args)
 		{
-			GLib.Object obj = o as GLib.Object;
+			Gtk.Object obj = o as Gtk.Object;
 			if (obj == null)
 				return;
+			obj.Destroyed -= NativeDestroyHandler;
 			obj.Dispose ();
 		}
 
@@ -65,12 +66,6 @@
 		[DllImport("libgtk-win32-2.0-0.dll")]
 		private static extern void gtk_object_destroy (IntPtr raw);
 
-		public override void Dispose ()
-		{
-			Destroyed -= NativeDestroyHandler;
-			base.Dispose ();
-		}
-
 		public virtual void Destroy ()
 		{
 			gtk_object_destroy (Handle);

gtk/Widget.custom

@@ -30,9 +30,6 @@ protected Widget (GLib.GType gtype) : base(gtype)
 	GLib.Marshaller.Free (name);
 }
 
-[DllImport("libgtk-win32-2.0-0.dll")]
-static extern void gtk_widget_destroy (IntPtr raw);
-
 public override void Destroy ()
 {
 	base.Destroy ();