[Commits] (stearns) Fix 2852: "merge-o"

commits at osafoundation.org commits at osafoundation.org
Tue Apr 19 14:38:15 PDT 2005


Commit by: stearns
Modified files:
chandler/parcels/osaf/framework/blocks/Block.py 1.105 1.106

Log message:
Fix 2852: "merge-o"

Bugzilla links:
http://bugzilla.osafoundation.org/show_bug.cgi?id=2852

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/Block.py.diff?r1=text&tr1=1.105&r2=text&tr2=1.106

Index: chandler/parcels/osaf/framework/blocks/Block.py
diff -u chandler/parcels/osaf/framework/blocks/Block.py:1.105 chandler/parcels/osaf/framework/blocks/Block.py:1.106
--- chandler/parcels/osaf/framework/blocks/Block.py:1.105	Tue Apr 19 11:26:17 2005
+++ chandler/parcels/osaf/framework/blocks/Block.py	Tue Apr 19 14:38:14 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.105 $"
-__date__ = "$Date: 2005/04/19 18:26:17 $"
+__version__ = "$Revision: 1.106 $"
+__date__ = "$Date: 2005/04/19 21:38:14 $"
 __copyright__ = "Copyright (c) 2003-2005 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -642,18 +642,12 @@
         # (The assert in CalculateWXBorder above checks this)
         if block.border.top != 0:
             flag |= wx.TOP
-            numBordersSpecified += 1
         if block.border.left != 0:
             flag |= wx.LEFT
-            numBordersSpecified += 1
         if block.border.bottom != 0:
             flag |= wx.BOTTOM
-            numBordersSpecified += 1
         if block.border.right != 0:
             flag |= wx.RIGHT
-            numBordersSpecified += 1
-        if numBordersSpecified > 1:
-            flag |= wx.ALL
 
         return flag
     CalculateWXFlag = classmethod(CalculateWXFlag)    



More information about the Commits mailing list