dabo Commit
Revision 5126
Date: 2009-03-14 08:14:17 -0700 (Sat, 14 Mar 2009)
Author: Pedro.Gato
Trac: http://trac.dabodev.com/changeset/5126
Changed:
U trunk/dabo/lib/datanav/Form.py
U trunk/dabo/ui/uiwx/dPageFrame.py
U trunk/dabo/ui/uiwx/dPageFrameMixin.py
Log:
This reverts my previous commit 5124 and properly fixes the problem... dPage*
must define _tabposTop, datanav was somehow causing the assert, but dPageList
never respected PageTabPosition="Top"
Diff:
Modified: trunk/dabo/lib/datanav/Form.py
===================================================================
--- trunk/dabo/lib/datanav/Form.py 2009-03-14 11:58:02 UTC (rev 5125)
+++ trunk/dabo/lib/datanav/Form.py 2009-03-14 15:14:17 UTC (rev 5126)
@@ -362,10 +362,6 @@
pass
if self.beforeSetupPageFrame():
- #PageTabPosition other than Left causes a c++ assert on
wxBookCtrlBase
- if self.PageFrameStyle.lower() == "list":
- self.PageTabPosition = "Left"
-
self.pageFrame = PageFrame.PageFrame(self,
tabStyle=self.PageFrameStyle,
TabPosition=self.PageTabPosition)
border = 3
Modified: trunk/dabo/ui/uiwx/dPageFrame.py
===================================================================
--- trunk/dabo/ui/uiwx/dPageFrame.py 2009-03-14 11:58:02 UTC (rev 5125)
+++ trunk/dabo/ui/uiwx/dPageFrame.py 2009-03-14 15:14:17 UTC (rev 5126)
@@ -36,6 +36,7 @@
"""
_evtPageChanged = readonly(wx.EVT_NOTEBOOK_PAGE_CHANGED)
_evtPageChanging = readonly(wx.EVT_NOTEBOOK_PAGE_CHANGING)
+ _tabposTop = readonly(wx.NB_TOP)
_tabposBottom = readonly(wx.NB_BOTTOM)
_tabposRight = readonly(wx.NB_RIGHT)
_tabposLeft = readonly(wx.NB_LEFT)
@@ -56,6 +57,7 @@
class dPageToolBar(dPageFrameMixin, wx.Toolbook):
_evtPageChanged = readonly(wx.EVT_TOOLBOOK_PAGE_CHANGED)
_evtPageChanging = readonly(wx.EVT_TOOLBOOK_PAGE_CHANGING)
+ _tabposTop = readonly(wx.BK_TOP)
_tabposBottom = readonly(wx.BK_BOTTOM)
_tabposRight = readonly(wx.BK_RIGHT)
_tabposLeft = readonly(wx.BK_LEFT)
@@ -80,6 +82,7 @@
_evtPageChanged = readonly(wx.EVT_LISTBOOK_PAGE_CHANGED)
_evtPageChanging = readonly(wx.EVT_LISTBOOK_PAGE_CHANGING)
_tabposBottom = readonly(wx.LB_BOTTOM)
+ _tabposTop = readonly(wx.LB_TOP)
_tabposRight = readonly(wx.LB_RIGHT)
_tabposLeft = readonly(wx.LB_LEFT)
@@ -135,6 +138,7 @@
class dPageSelect(dPageFrameMixin, wx.Choicebook):
_evtPageChanged = readonly(wx.EVT_CHOICEBOOK_PAGE_CHANGED)
_evtPageChanging = readonly(wx.EVT_CHOICEBOOK_PAGE_CHANGING)
+ _tabposTop = readonly(wx.CHB_TOP)
_tabposBottom = readonly(wx.CHB_BOTTOM)
_tabposRight = readonly(wx.CHB_RIGHT)
_tabposLeft = readonly(wx.CHB_LEFT)
Modified: trunk/dabo/ui/uiwx/dPageFrameMixin.py
===================================================================
--- trunk/dabo/ui/uiwx/dPageFrameMixin.py 2009-03-14 11:58:02 UTC (rev
5125)
+++ trunk/dabo/ui/uiwx/dPageFrameMixin.py 2009-03-14 15:14:17 UTC (rev
5126)
@@ -384,12 +384,13 @@
def _setTabPosition(self, val):
val = str(val)
+ self._delWindowStyleFlag(self._tabposTop)
self._delWindowStyleFlag(self._tabposBottom)
self._delWindowStyleFlag(self._tabposRight)
self._delWindowStyleFlag(self._tabposLeft)
if val == "Top":
- pass
+ self._addWindowStyleFlag(self._tabposTop)
elif val == "Left":
self._addWindowStyleFlag(self._tabposLeft)
elif val == "Right":
_______________________________________________
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]
