dabo Commit
Revision 6633
Date: 2011-06-20 09:37:42 -0700 (Mon, 20 Jun 2011)
Author: Paul
Trac: http://trac.dabodev.com/changeset/6633
Changed:
U trunk/dabo/ui/uiwx/dPemMixin.py
Log:
Refactored essentially duplicate code out of _setWidth(), _setHeight(), and
_setSize().
Diff:
Modified: trunk/dabo/ui/uiwx/dPemMixin.py
===================================================================
--- trunk/dabo/ui/uiwx/dPemMixin.py 2011-06-18 00:42:24 UTC (rev 6632)
+++ trunk/dabo/ui/uiwx/dPemMixin.py 2011-06-20 16:37:42 UTC (rev 6633)
@@ -2195,18 +2195,7 @@
else:
width = -1
newSize = (width, int(val))
- self._heightAlreadySet = True
- if isinstance(self, (wx.Frame, wx.Dialog) ):
- self.SetSize(newSize)
- else:
- if isinstance(self, wx.Panel):
- self.SetMinSize((-1, 10))
- if hasattr(self, "SetInitialSize"):
- # wxPython 2.7.x:
- self.SetInitialSize(newSize)
- else:
- # prior to wxPython 2.7.s:
- self.SetBestFittingSize(newSize)
+ self._setSize(newSize)
if isinstance(self, dabo.ui.dFormMixin):
self._defaultHeight = val
else:
@@ -2526,7 +2515,8 @@
def _setSize(self, val):
if self._constructed():
- self._widthAlreadySet = self._heightAlreadySet = True
+ self._widthAlreadySet = (val[0] >= 0)
+ self._heightAlreadySet = (val[1] >= 0)
if isinstance(self, (wx.Frame, wx.Dialog) ):
self.SetSize(val)
else:
@@ -2694,18 +2684,7 @@
else:
height = -1
newSize = (int(val), height)
- self._widthAlreadySet = True
- if isinstance(self, (wx.Frame, wx.Dialog) ):
- self.SetSize(newSize)
- else:
- if isinstance(self, wx.Panel):
- self.SetMinSize((10, -1))
- if hasattr(self, "SetInitialSize"):
- # wxPython 2.7.x:
- self.SetInitialSize(newSize)
- else:
- # prior to wxPython 2.7.s:
- self.SetBestFittingSize(newSize)
+ self._setSize(newSize)
if isinstance(self, dabo.ui.dFormMixin):
self._defaultWidth = val
else:
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message:
http://leafe.com/archives/byMID/[email protected]
