Author: mkestner
Date: 2005-05-11 20:42:21 -0400 (Wed, 11 May 2005)
New Revision: 44420

Modified:
   trunk/gtk-sharp/ChangeLog
   trunk/gtk-sharp/doc/en/Gtk/Object.xml
   trunk/gtk-sharp/glib/Object.cs
   trunk/gtk-sharp/gtk/Object.custom
Log:

2005-05-11  Mike Kestner  <[EMAIL PROTECTED]>

        * glib/Object.cs : mark Dispose virtual.
        * gtk/Object.cs : release the Destroy handler in Dispose.


Modified: trunk/gtk-sharp/ChangeLog
===================================================================
--- trunk/gtk-sharp/ChangeLog   2005-05-12 00:02:21 UTC (rev 44419)
+++ trunk/gtk-sharp/ChangeLog   2005-05-12 00:42:21 UTC (rev 44420)
@@ -1,5 +1,10 @@
 2005-05-11  Mike Kestner  <[EMAIL PROTECTED]>
 
+       * glib/Object.cs : mark Dispose virtual.
+       * gtk/Object.cs : release the Destroy handler in Dispose.
+
+2005-05-11  Mike Kestner  <[EMAIL PROTECTED]>
+
        * configure.in.in : s/-g/-debug
 
 2005-05-11  Mike Kestner  <[EMAIL PROTECTED]>

Modified: trunk/gtk-sharp/doc/en/Gtk/Object.xml
===================================================================
--- trunk/gtk-sharp/doc/en/Gtk/Object.xml       2005-05-12 00:02:21 UTC (rev 
44419)
+++ trunk/gtk-sharp/doc/en/Gtk/Object.xml       2005-05-12 00:42:21 UTC (rev 
44420)
@@ -451,5 +451,17 @@
         </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>
\ No newline at end of file
+</Type>

Modified: trunk/gtk-sharp/glib/Object.cs
===================================================================
--- trunk/gtk-sharp/glib/Object.cs      2005-05-12 00:02:21 UTC (rev 44419)
+++ trunk/gtk-sharp/glib/Object.cs      2005-05-12 00:42:21 UTC (rev 44420)
@@ -72,7 +72,7 @@
                        return false;
                }
 
-               public void Dispose ()
+               public virtual void Dispose ()
                {
                        if (disposed)
                                return;

Modified: trunk/gtk-sharp/gtk/Object.custom
===================================================================
--- trunk/gtk-sharp/gtk/Object.custom   2005-05-12 00:02:21 UTC (rev 44419)
+++ trunk/gtk-sharp/gtk/Object.custom   2005-05-12 00:42:21 UTC (rev 44420)
@@ -65,11 +65,15 @@
                [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 ()
                {
-                       Destroyed -= NativeDestroyHandler;
                        gtk_object_destroy (Handle);
-                       Dispose ();
                }
 
                public bool IsFloating {

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

Reply via email to