Changeset 48

Timestamp:

03/04/08 18:04:23 (7 months ago)

Author:

Chris Miller

Message:

Make Control.dispose() public again.

Files:

• trunk/win32/dfl/control.d (modified) (2 diffs)

trunk/win32/dfl/control.d

@@ -5946 +5946 @@
-    
-    
+    ///
+    void dispose()
+    {
+        dispose(true);
+    }
+    
+    /// ditto
+    protected void dispose(bool disposing)
+    {
+        if(disposing)
+        {
+            killing = true;
+            
+            cmenu = cmenu.init;
+            _ctrlname = _ctrlname.init;
+            otag = otag.init;
+            wcurs = wcurs.init;
+            wfont = wfont.init;
+            wparent = wparent.init;
+            wregion = wregion.init;
+            wtext = wtext.init;
+            deleteThisBackgroundBrush();
+            //ccollection.children = null; // Not GC-safe in dtor.
+            //ccollection = null; // ? Causes bad things. Leaving it will do just fine.
+        }
+        
+        if(!isHandleCreated)
+            return;
+        
+        destroyHandle();
+        /+
+        //assert(hwnd == HWND.init); // Zombie trips this. (Not anymore with the hwnd-prop)
+        if(hwnd)
+        {
+            assert(!IsWindow(hwnd));
+            hwnd = HWND.init;
+        }
+        +/
+        assert(hwnd == HWND.init);
+        
+        onDisposed(EventArgs.empty);
+    }
+    
+    
-    protected:
-    
@@ -6347 +6391 @@
-    {
-        disposed(this, ea);
-    }
-    
-    
-    ///
-    void dispose()
-    {
-        dispose(true);
-    }
-    
-    
-    ///
-    void dispose(bool disposing)
-    {
-        if(disposing)
-        {
-            killing = true;
-            
-            cmenu = cmenu.init;
-            _ctrlname = _ctrlname.init;
-            otag = otag.init;
-            wcurs = wcurs.init;
-            wfont = wfont.init;
-            wparent = wparent.init;
-            wregion = wregion.init;
-            wtext = wtext.init;
-            deleteThisBackgroundBrush();
-            //ccollection.children = null; // Not GC-safe in dtor.
-            //ccollection = null; // ? Causes bad things. Leaving it will do just fine.
-        }
-        
-        if(!isHandleCreated)
-            return;
-        
-        destroyHandle();
-        /+
-        //assert(hwnd == HWND.init); // Zombie trips this. (Not anymore with the hwnd-prop)
-        if(hwnd)
-        {
-            assert(!IsWindow(hwnd));
-            hwnd = HWND.init;
-        }
-        +/
-        assert(hwnd == HWND.init);
-        
-        onDisposed(EventArgs.empty);
-    }
-