Author: mkestner
Date: 2005-05-11 22:49:26 -0400 (Wed, 11 May 2005)
New Revision: 44421

Modified:
   trunk/gtk-sharp/doc/en/Gtk/Object.xml
   trunk/gtk-sharp/gtk/Object.custom
   trunk/gtk-sharp/gtk/Widget.custom
Log:
reverting to a less broken state for now

Modified: trunk/gtk-sharp/doc/en/Gtk/Object.xml
===================================================================
--- trunk/gtk-sharp/doc/en/Gtk/Object.xml       2005-05-12 00:42:21 UTC (rev 
44420)
+++ trunk/gtk-sharp/doc/en/Gtk/Object.xml       2005-05-12 02:49:26 UTC (rev 
44421)
@@ -451,17 +451,5 @@
         </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>

Modified: trunk/gtk-sharp/gtk/Object.custom
===================================================================
--- trunk/gtk-sharp/gtk/Object.custom   2005-05-12 00:42:21 UTC (rev 44420)
+++ trunk/gtk-sharp/gtk/Object.custom   2005-05-12 02:49:26 UTC (rev 44421)
@@ -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);

Modified: trunk/gtk-sharp/gtk/Widget.custom
===================================================================
--- trunk/gtk-sharp/gtk/Widget.custom   2005-05-12 00:42:21 UTC (rev 44420)
+++ trunk/gtk-sharp/gtk/Widget.custom   2005-05-12 02:49:26 UTC (rev 44421)
@@ -30,9 +30,6 @@
        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 ();

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to