[Commits] (john) * Removed cruft that is no longer necessary

[commits at osafoundation.org]

Commit by: john
Modified files:
chandler/parcels/osaf/framework/blocks/ContainerBlocks.py 1.153 1.154
chandler/parcels/osaf/framework/blocks/ControlBlocks.py 1.194 1.195
chandler/parcels/osaf/framework/blocks/detail/Detail.py 1.110 1.111

Log message:
* Removed cruft that is no longer necessary

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/ContainerBlocks.py.diff?r1=text&tr1=1.153&r2=text&tr2=1.154
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/ControlBlocks.py.diff?r1=text&tr1=1.194&r2=text&tr2=1.195
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/framework/blocks/detail/Detail.py.diff?r1=text&tr1=1.110&r2=text&tr2=1.111

Index: chandler/parcels/osaf/framework/blocks/ContainerBlocks.py
diff -u chandler/parcels/osaf/framework/blocks/ContainerBlocks.py:1.153 chandler/parcels/osaf/framework/blocks/ContainerBlocks.py:1.154
--- chandler/parcels/osaf/framework/blocks/ContainerBlocks.py:1.153	Wed Apr  6 18:01:03 2005
+++ chandler/parcels/osaf/framework/blocks/ContainerBlocks.py	Thu Apr  7 12:51:50 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.153 $"
-__date__ = "$Date: 2005/04/07 01:01:03 $"
+__version__ = "$Revision: 1.154 $"
+__date__ = "$Date: 2005/04/07 19:51:50 $"
 __copyright__ = "Copyright (c) 2003-2005 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -333,14 +333,6 @@
 class ViewContainer(BoxContainer):
     def instantiateWidget (self):
         """
-        There is a repository bug where copying trees of blocks won't copy parentBlock
-        when it's initialValue is None -- DJA
-        """
-        try:
-            parentBlock = self.parentBlock
-        except AttributeError:
-            self.parentBlock = None
-        """
           Somewhat of a hack: When the ViewContainer is the root of all the blocks
         it doesn't have a parent block widget, so in that case we use the mainFrame.
         """

Index: chandler/parcels/osaf/framework/blocks/ControlBlocks.py
diff -u chandler/parcels/osaf/framework/blocks/ControlBlocks.py:1.194 chandler/parcels/osaf/framework/blocks/ControlBlocks.py:1.195
--- chandler/parcels/osaf/framework/blocks/ControlBlocks.py:1.194	Thu Mar 24 17:21:56 2005
+++ chandler/parcels/osaf/framework/blocks/ControlBlocks.py	Thu Apr  7 12:51:51 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.194 $"
-__date__ = "$Date: 2005/03/25 01:21:56 $"
+__version__ = "$Revision: 1.195 $"
+__date__ = "$Date: 2005/04/07 19:51:51 $"
 __copyright__ = "Copyright (c) 2003-2005 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -655,11 +655,7 @@
         if self.blockItem.hideColumnHeadings:
             self.SetColLabelSize (0)
         else:
-            """
-              Should be using wx.grid.GRID_DEFAULT_COL_LABEL_HEIGHT, but
-            it hasn't been wrapped yet -- DJA
-            """
-            self.SetColLabelSize (20)
+            self.SetColLabelSize (wx.grid.GRID_DEFAULT_COL_LABEL_HEIGHT)
 
         gridTable = self.GetTable()
         newRows = gridTable.GetNumberRows()

Index: chandler/parcels/osaf/framework/blocks/detail/Detail.py
diff -u chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.110 chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.111
--- chandler/parcels/osaf/framework/blocks/detail/Detail.py:1.110	Mon Mar 28 15:33:15 2005
+++ chandler/parcels/osaf/framework/blocks/detail/Detail.py	Thu Apr  7 12:51:51 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.110 $"
-__date__ = "$Date: 2005/03/28 23:33:15 $"
+__version__ = "$Revision: 1.111 $"
+__date__ = "$Date: 2005/04/07 19:51:51 $"
 __copyright__ = "Copyright (c) 2004-2005 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -63,10 +63,7 @@
                 self.dumpShownHierarchy ('onSelectItemEvent')
     
     def __changeSelection(self, item):
-        # @@@BJS For now, avoid dirtying selection if it's already right
-        # (This optimization may get done in the repository in 0.6...)
-        if self.selection != item:
-            self.selection = item
+        self.selection = item
         
         # Make sure the itemcollection that we monitor includes only the selected item.
         if len(self.contents.inclusions) != 1 or self.contents.inclusions.first() is not item: