daboide Commit
Revision 398
Date: 2006-01-27 12:17:21 -0800 (Fri, 27 Jan 2006)
Author: ed

Changed:
U   trunk/Designer.py

Log:
Fixed the routine for deleting sizers from the object tree.


Diff:
Modified: trunk/Designer.py
===================================================================
--- trunk/Designer.py   2006-01-27 18:38:07 UTC (rev 397)
+++ trunk/Designer.py   2006-01-27 20:17:21 UTC (rev 398)
@@ -893,7 +893,7 @@
                ret = dabo.ui.dMenu()
                self._treeContextObj = obj
                if isinstance(obj, dui.dSizerMixin):
-                       if obj.ControllingSizer:
+                       if obj.ControllingSizer is not None or not 
isinstance(obj.Parent, dui.dForm):
                                # Don't delete the main sizer for the form.
                                ret.append(_("Delete"), self.onTreeDelete)
                elif isinstance(obj, cmix):
@@ -907,7 +907,19 @@
        
        def onTreeDelete(self, evt):
                obj = self._treeContextObj
-               obj.ControllingSizer.delete(obj)
+               csz = obj.ControllingSizer
+               if csz:
+                       csz.delete(obj)
+               elif isinstance(obj, dui.dSizerMixin):
+                       try:
+                               obj.Parent.Sizer = None
+                       except: 
+                               pass
+                       obj.release(True)
+                       dabo.ui.callAfter(self.updateLayout)
+               else:
+                       obj.release()
+                       dabo.ui.callAfter(self.updateLayout)
                
                
        def addNewControl(self, pnl, cls, props=None, attProperties=None,




_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev

Reply via email to