dabo Commit
Revision 2072
Date: 2006-03-31 14:15:52 -0800 (Fri, 31 Mar 2006)
Author: paul
Changed:
U trunk/dabo/biz/dAutoBizobj.py
U trunk/dabo/db/dCursorMixin.py
U trunk/dabo/db/dTable.py
U trunk/dabo/lib/datanav/Bizobj.py
U trunk/dabo/lib/datanav/Form.py
U trunk/dabo/lib/datanav/Page.py
U trunk/dabo/ui/dialogs/login.py
U trunk/dabo/ui/uitk/dCheckBox.py
U trunk/dabo/ui/uitk/dLabel.py
U trunk/dabo/ui/uitk/dPemMixin.py
U trunk/dabo/ui/uitk/uiApp.py
U trunk/dabo/ui/uiwx/dBaseMenuBar.py
U trunk/dabo/ui/uiwx/dCheckBox.py
U trunk/dabo/ui/uiwx/dDateTextBox.py
U trunk/dabo/ui/uiwx/dEditor.py
U trunk/dabo/ui/uiwx/dGrid.py
U trunk/dabo/ui/uiwx/dRadioGroup.py
U trunk/dabo/ui/uiwx/dTextBox.py
U trunk/dabo/ui/uiwx/masked/maskededit.py
Log:
Changed all cls.doDefault() calls to self.super() calls instead.
Diff:
Modified: trunk/dabo/biz/dAutoBizobj.py
===================================================================
--- trunk/dabo/biz/dAutoBizobj.py 2006-03-31 20:04:41 UTC (rev 2071)
+++ trunk/dabo/biz/dAutoBizobj.py 2006-03-31 22:15:52 UTC (rev 2072)
@@ -53,7 +53,7 @@
class DbAdminLogin(dabo.ui.dDialog):
def __init__(self, parent, conn):
self._conn = conn
- DbAdminLogin.doDefault(parent)
+ self.super(parent)
def addControls(self):
self.Caption = self.Application.getAppInfo("appName")
@@ -178,7 +178,7 @@
is set to true.
If there is a field that is a stamp field, it is set to not update that field."""
def _beforeInit(self):
- dAutoBizobj.doDefault()
+ self.super()
self._table = None
self._table_checked = False
Modified: trunk/dabo/db/dCursorMixin.py
===================================================================
--- trunk/dabo/db/dCursorMixin.py 2006-03-31 20:04:41 UTC (rev 2071)
+++ trunk/dabo/db/dCursorMixin.py 2006-03-31 22:15:52 UTC (rev 2072)
@@ -33,7 +33,7 @@
if sql and isinstance(sql, basestring) and len(sql) > 0:
self.UserSQL = sql
- #dCursorMixin.doDefault()
+ #self.super()
#super(dCursorMixin, self).__init__()
## pkm: Neither of the above are correct. We need to explicitly
## call dObject's __init__, otherwise the cursor object with
Modified: trunk/dabo/db/dTable.py
===================================================================
--- trunk/dabo/db/dTable.py 2006-03-31 20:04:41 UTC (rev 2071)
+++ trunk/dabo/db/dTable.py 2006-03-31 22:15:52 UTC (rev 2072)
@@ -41,7 +41,7 @@
self._fields = []
self._indexes = []
self._pk = None
- dTable.doDefault(*args, **kwargs)
+ self.super(*args, **kwargs)
def __str__(self):
@@ -139,7 +139,7 @@
self._baseClass = dIndex
self._name = ""
self._fields = None
- dIndex.doDefault(*args, **kwargs)
+ self.super(*args, **kwargs)
def __str__(self):
@@ -188,7 +188,7 @@
self._default = None
self._autoincrement = False
self._isPK = False
- dField.doDefault(*args, **kwargs)
+ self.super(*args, **kwargs)
def __str__(self):
@@ -332,7 +332,7 @@
self._size = 1
self._total_dp = 0
self._right_dp = 0
- fType.doDefault(*args, **kwargs)
+ self.super(*args, **kwargs)
def _setDataType(self, datatype):
Modified: trunk/dabo/lib/datanav/Bizobj.py
===================================================================
--- trunk/dabo/lib/datanav/Bizobj.py 2006-03-31 20:04:41 UTC (rev 2071)
+++ trunk/dabo/lib/datanav/Bizobj.py 2006-03-31 22:15:52 UTC (rev 2072)
@@ -22,7 +22,7 @@
if alias is not None:
self.BackendTableFields[alias] = (table, field)
- Bizobj.doDefault(fld)
+ self.super(fld)
def _getBackendTableFields(self):
Modified: trunk/dabo/lib/datanav/Form.py
===================================================================
--- trunk/dabo/lib/datanav/Form.py 2006-03-31 20:04:41 UTC (rev 2071)
+++ trunk/dabo/lib/datanav/Form.py 2006-03-31 22:15:52 UTC (rev 2072)
@@ -50,7 +50,7 @@
def _initEvents(self):
self.bindEvent(dEvents.Close, self._onClose)
- Form.doDefault()
+ self.super()
def __init__(self, parent=None, previewMode=False, tbl="", *args, **kwargs):
@@ -97,27 +97,21 @@
if dataSource is None:
if self.saveCancelRequeryAll:
dataSource = self._mainTable
- #return Form.doDefault(dataSource)
- return super(Form, self).cancel(dataSource)
+ return self.super(dataSource)
-
def requery(self, dataSource=None):
if dataSource is None:
if self.saveCancelRequeryAll:
dataSource = self._mainTable
- #return Form.doDefault(dataSource)
- return super(Form, self).requery(dataSource)
+ return self.super(dataSource)
-
def confirmChanges(self):
if self.preview:
# Nothing to check
return True
else:
- #return Form.doDefault()
- return super(Form, self).confirmChanges()
+ return self.super()
-
def afterSetPrimaryBizobj(self):
pass
Modified: trunk/dabo/lib/datanav/Page.py
===================================================================
--- trunk/dabo/lib/datanav/Page.py 2006-03-31 20:04:41 UTC (rev 2071)
+++ trunk/dabo/lib/datanav/Page.py 2006-03-31 22:15:52 UTC (rev 2072)
@@ -22,7 +22,7 @@
# Controls for the select page:
class SelectControlMixin(dObject):
def initProperties(self):
- SelectControlMixin.doDefault()
+ self.super()
self.SaveRestoreValue = True
class SelectTextBox(SelectControlMixin, dabo.ui.dTextBox): pass
@@ -37,11 +37,11 @@
class SelectionOpDropdown(dabo.ui.dDropdownList):
def initProperties(self):
- SelectionOpDropdown.doDefault()
+ self.super()
self.SaveRestoreValue = True
def initEvents(self):
- SelectionOpDropdown.doDefault()
+ self.super()
self.bindEvent(dEvents.Hit, self.onChoiceMade)
self.bindEvent(dEvents.ValueChanged, self.onValueChanged)
@@ -73,7 +73,7 @@
class Page(dabo.ui.dPage):
def _createItems(self):
- Page.doDefault()
+ self.super()
## The following line is needed to get the Select page scrollbars to lay
## out without the user having to resize manually. I tried putting it in
Modified: trunk/dabo/ui/dialogs/login.py
===================================================================
--- trunk/dabo/ui/dialogs/login.py 2006-03-31 20:04:41 UTC (rev 2071)
+++ trunk/dabo/ui/dialogs/login.py 2006-03-31 22:15:52 UTC (rev 2072)
@@ -112,11 +112,11 @@
def onCancel(self, evt):
self.user, self.password = None, None
- Login.doDefault(evt)
+ self.super(evt)
def onOK(self, evt):
self.user, self.password = self.txtUserName.Value, self.txtPassword.Value
- Login.doDefault(evt)
+ self.super(evt)
if __name__ == '__main__':
Modified: trunk/dabo/ui/uitk/dCheckBox.py
===================================================================
--- trunk/dabo/ui/uitk/dCheckBox.py 2006-03-31 20:04:41 UTC (rev 2071)
+++ trunk/dabo/ui/uitk/dCheckBox.py 2006-03-31 22:15:52 UTC (rev 2072)
@@ -21,7 +21,7 @@
def initEvents(self):
- dCheckBox.doDefault()
+ self.super()
self.bindEvent(dEvents.MouseLeftClick, self._onTkHit)
self.bindEvent(dEvents.KeyDown, self._onKeyDown)
@@ -81,7 +81,7 @@
if __name__ == "__main__":
class C(dCheckBox):
def initEvents(self):
- C.doDefault()
+ self.super()
self.bindEvent(dEvents.Hit, self.onHit)
def onHit(self, evt):
Modified: trunk/dabo/ui/uitk/dLabel.py
===================================================================
--- trunk/dabo/ui/uitk/dLabel.py 2006-03-31 20:04:41 UTC (rev 2071)
+++ trunk/dabo/ui/uitk/dLabel.py 2006-03-31 22:15:52 UTC (rev 2072)
@@ -23,7 +23,7 @@
def initEvents(self):
- dLabel.doDefault()
+ self.super()
# # property get/set functions
Modified: trunk/dabo/ui/uitk/dPemMixin.py
===================================================================
--- trunk/dabo/ui/uitk/dPemMixin.py 2006-03-31 20:04:41 UTC (rev 2071)
+++ trunk/dabo/ui/uitk/dPemMixin.py 2006-03-31 22:15:52 UTC (rev 2072)
@@ -177,12 +177,12 @@
def raiseEvent(self, eventClass, nativeEvent=None, *args, **kwargs):
# Call the Dabo-native raiseEvent(), passing along the Tkinter after_idle
# function, so that the Dabo events can be processed at next idle.
- return dPemMixin.doDefault(eventClass, nativeEvent, callAfterFunc=self.after_idle,
+ return self.super(eventClass, nativeEve
[excessive length snipped]
©2006 Paul McNett |
|
