dabo Commit
Revision 1501
Date: 2005-11-01 06:59:19 -0800 (Tue, 01 Nov 2005)
Author: paul
Changed:
U trunk/dabo/lib/datanav/Page.py
U trunk/dabo/ui/uiwx/dFormMixin.py
U trunk/dabo/ui/uiwx/dPageFrameMixin.py
U trunk/dabo/ui/uiwx/dPageNoTabs.py
Log:
Changed property name dPageFrame.SelectedPageNum to SelectedPageNumber.
Fixed a bug when setting form.Toolbar = None.
Diff:
Modified: trunk/dabo/lib/datanav/Page.py
===================================================================
--- trunk/dabo/lib/datanav/Page.py 2005-11-01 06:02:36 UTC (rev 1500)
+++ trunk/dabo/lib/datanav/Page.py 2005-11-01 14:59:19 UTC (rev 1501)
@@ -338,9 +338,9 @@
ret = frm.requery()
if ret:
- if self.Parent.SelectedPageNum == 0:
+ if self.Parent.SelectedPageNumber == 0:
# If the select page is active, now make the
browse page active
- self.Parent.SelectedPageNum = 1
+ self.Parent.SelectedPageNumber = 1
def getSelectorOptions(self, typ, ws):
Modified: trunk/dabo/ui/uiwx/dFormMixin.py
===================================================================
--- trunk/dabo/ui/uiwx/dFormMixin.py 2005-11-01 06:02:36 UTC (rev 1500)
+++ trunk/dabo/ui/uiwx/dFormMixin.py 2005-11-01 14:59:19 UTC (rev 1501)
@@ -298,8 +298,9 @@
def _setToolBar(self, val):
self.SetToolBar(val)
- # the wx toolbar doesn't otherwise know what form it is
attached to:
- val.Form = self
+ if val is not None:
+ # the wx toolbar doesn't otherwise know what form it is
attached to:
+ val.Form = self
def close(self, force=False):
""" This method will close the form. If force = False (default)
Modified: trunk/dabo/ui/uiwx/dPageFrameMixin.py
===================================================================
--- trunk/dabo/ui/uiwx/dPageFrameMixin.py 2005-11-01 06:02:36 UTC (rev
1500)
+++ trunk/dabo/ui/uiwx/dPageFrameMixin.py 2005-11-01 14:59:19 UTC (rev
1501)
@@ -195,14 +195,14 @@
self._properties["SelectedPage"] = pg
- def _getSelectedPageNum(self):
+ def _getSelectedPageNumber(self):
return self.GetSelection()
- def _setSelectedPageNum(self, val):
+ def _setSelectedPageNumber(self, val):
if self._constructed():
self.SetSelection(val)
else:
- self._properties["SelectedPageNum"] = val
+ self._properties["SelectedPageNumber"] = val
def _getTabPosition(self):
@@ -253,7 +253,8 @@
SelectedPage = property(_getSelectedPage, _setSelectedPage, None,
_("References the current frontmost page. (dPage)") )
- SelectedPageNum = property(_getSelectedPageNum, _setSelectedPageNum,
None,
+ SelectedPageNumber = property(_getSelectedPageNumber,
_setSelectedPageNumber,
+ None,
_("Returns the index of the current frontmost page.
(int)") )
TabPosition = property(_getTabPosition, _setTabPosition, None,
Modified: trunk/dabo/ui/uiwx/dPageNoTabs.py
===================================================================
--- trunk/dabo/ui/uiwx/dPageNoTabs.py 2005-11-01 06:02:36 UTC (rev 1500)
+++ trunk/dabo/ui/uiwx/dPageNoTabs.py 2005-11-01 14:59:19 UTC (rev 1501)
@@ -52,9 +52,9 @@
it will select the first page.
"""
try:
- self.SelectedPageNum += 1
+ self.SelectedPageNumber += 1
except IndexError:
- self.SelectedPageNum = 0
+ self.SelectedPageNumber = 0
def priorPage(self):
@@ -62,7 +62,7 @@
it will select the last page.
"""
try:
- self.SelectedPageNum -= 1
+ self.SelectedPageNumber -= 1
except IndexError:
self.SelectedPage = self.Pages[-1]
@@ -128,7 +128,7 @@
SelectedPage = property(_getSel, _setSel, None,
_("Returns a reference to the currently displayed page
(dPage | dPanel)") )
- SelectedPageNum = property(_getSelNum, _setSelNum, None,
+ SelectedPageNumber = property(_getSelNum, _setSelNum, None,
_("Returns a reference to the index of the currently
displayed page (int)") )
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
