dabo Commit
Revision 6337
Date: 2011-01-22 09:28:24 -0800 (Sat, 22 Jan 2011)
Author: Ed
Trac: http://trac.dabodev.com/changeset/6337
Changed:
U trunk/dabo/ui/uiwx/dBitmap.py
U trunk/dabo/ui/uiwx/dBitmapButton.py
U trunk/dabo/ui/uiwx/dBorderlessButton.py
U trunk/dabo/ui/uiwx/dBox.py
U trunk/dabo/ui/uiwx/dButton.py
U trunk/dabo/ui/uiwx/dCalendar.py
U trunk/dabo/ui/uiwx/dCheckBox.py
U trunk/dabo/ui/uiwx/dCheckList.py
U trunk/dabo/ui/uiwx/dComboBox.py
U trunk/dabo/ui/uiwx/dDockForm.py
U trunk/dabo/ui/uiwx/dDropdownList.py
U trunk/dabo/ui/uiwx/dEditBox.py
U trunk/dabo/ui/uiwx/dEditableList.py
U trunk/dabo/ui/uiwx/dEditor.py
U trunk/dabo/ui/uiwx/dForm.py
U trunk/dabo/ui/uiwx/dFormMixin.py
U trunk/dabo/ui/uiwx/dGauge.py
U trunk/dabo/ui/uiwx/dGlWindow.py
U trunk/dabo/ui/uiwx/dGrid.py
U trunk/dabo/ui/uiwx/dHtmlBox.py
U trunk/dabo/ui/uiwx/dHyperLink.py
U trunk/dabo/ui/uiwx/dImage.py
U trunk/dabo/ui/uiwx/dLabel.py
U trunk/dabo/ui/uiwx/dLine.py
U trunk/dabo/ui/uiwx/dLinePlot.py
U trunk/dabo/ui/uiwx/dListBox.py
U trunk/dabo/ui/uiwx/dListControl.py
U trunk/dabo/ui/uiwx/dMaskedTextBox.py
U trunk/dabo/ui/uiwx/dMediaControl.py
U trunk/dabo/ui/uiwx/dMenu.py
U trunk/dabo/ui/uiwx/dPageFrame.py
U trunk/dabo/ui/uiwx/dPdfWindow.py
U trunk/dabo/ui/uiwx/dRadioList.py
U trunk/dabo/ui/uiwx/dRichTextBox.py
U trunk/dabo/ui/uiwx/dSearchBox.py
U trunk/dabo/ui/uiwx/dShell.py
U trunk/dabo/ui/uiwx/dSlidePanelControl.py
U trunk/dabo/ui/uiwx/dSlider.py
U trunk/dabo/ui/uiwx/dSpinner.py
U trunk/dabo/ui/uiwx/dSplitter.py
U trunk/dabo/ui/uiwx/dStatusBar.py
U trunk/dabo/ui/uiwx/dTextBox.py
U trunk/dabo/ui/uiwx/dTextBoxMixin.py
U trunk/dabo/ui/uiwx/dToggleButton.py
U trunk/dabo/ui/uiwx/dToolBar.py
U trunk/dabo/ui/uiwx/dTreeView.py
Log:
Fixed a problem that was due to the way we were calling the super() of
__init__(): we were taking the keyword params 'properties' and 'attProperties'
and passing them as non-keyword params. This was causing some subtle errors
that mostly manifested in the Class Designer.
Changed the default for self._fontSize from None to 10, as some routines were
expecting it to be an int and throwing errors on receiving a NoneType value.
Diff:
Modified: trunk/dabo/ui/uiwx/dBitmap.py
===================================================================
--- trunk/dabo/ui/uiwx/dBitmap.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dBitmap.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -21,8 +21,8 @@
picName = self._extractKey((kwargs, properties, attProperties),
"Picture", "")
dim.dImageMixin.__init__(self)
- cm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties,
- *args, **kwargs)
+ cm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
if picName:
self.Picture = picName
Modified: trunk/dabo/ui/uiwx/dBitmapButton.py
===================================================================
--- trunk/dabo/ui/uiwx/dBitmapButton.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dBitmapButton.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -37,7 +37,8 @@
self._bmpBorder = 10
dim.dImageMixin.__init__(self)
- cm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ cm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _initEvents(self):
Modified: trunk/dabo/ui/uiwx/dBorderlessButton.py
===================================================================
--- trunk/dabo/ui/uiwx/dBorderlessButton.py 2011-01-22 16:59:01 UTC (rev
6336)
+++ trunk/dabo/ui/uiwx/dBorderlessButton.py 2011-01-22 17:28:24 UTC (rev
6337)
@@ -46,8 +46,8 @@
# around the bitmap image in order for it to appear correctly
self._bmpBorder = 10
- cm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties,
- *args, **kwargs)
+ cm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _initEvents(self):
Modified: trunk/dabo/ui/uiwx/dBox.py
===================================================================
--- trunk/dabo/ui/uiwx/dBox.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dBox.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -14,7 +14,8 @@
def __init__(self, parent, properties=None, attProperties=None, *args,
**kwargs):
self._baseClass = dBox
preClass = wx.PreStaticBox
- cm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ cm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _initEvents(self):
Modified: trunk/dabo/ui/uiwx/dButton.py
===================================================================
--- trunk/dabo/ui/uiwx/dButton.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dButton.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -28,8 +28,8 @@
def __init__(self, parent, properties=None, attProperties=None, *args,
**kwargs):
self._baseClass = dButton
preClass = wx.PreButton
- cm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties,
- *args, **kwargs)
+ cm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _initEvents(self):
Modified: trunk/dabo/ui/uiwx/dCalendar.py
===================================================================
--- trunk/dabo/ui/uiwx/dCalendar.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dCalendar.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -39,7 +39,8 @@
self._currentMonth = None
self._currentYear = None
- dcm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ dcm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
# Store some event types in case we need to raise them
self._setCalEventTypes()
Modified: trunk/dabo/ui/uiwx/dCheckBox.py
===================================================================
--- trunk/dabo/ui/uiwx/dCheckBox.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dCheckBox.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -15,8 +15,8 @@
def __init__(self, parent, properties=None, attProperties=None, *args,
**kwargs):
self._baseClass = dCheckBox
preClass = wx.PreCheckBox
- dcm.dDataControlMixin.__init__(self, preClass, parent,
properties,
- attProperties, *args, **kwargs)
+ dcm.dDataControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _initEvents(self):
Modified: trunk/dabo/ui/uiwx/dCheckList.py
===================================================================
--- trunk/dabo/ui/uiwx/dCheckList.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dCheckList.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -16,8 +16,8 @@
self._baseClass = dCheckList
self._choices = []
preClass = wx.PreCheckListBox
- dcm.dControlItemMixin.__init__(self, preClass, parent,
properties,
- attProperties, *args, **kwargs)
+ dcm.dControlItemMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _initEvents(self):
Modified: trunk/dabo/ui/uiwx/dComboBox.py
===================================================================
--- trunk/dabo/ui/uiwx/dComboBox.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dComboBox.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -28,7 +28,8 @@
self._textToAppend = ""
preClass = wx.PreComboBox
- dcm.dControlItemMixin.__init__(self, preClass, parent,
properties, attProperties, *args, **kwargs)
+ dcm.dControlItemMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _preInitUI(self, kwargs):
Modified: trunk/dabo/ui/uiwx/dDockForm.py
===================================================================
--- trunk/dabo/ui/uiwx/dDockForm.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dDockForm.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -96,7 +96,8 @@
self._showMaximizeButton = False
self._showMinimizeButton = False
self._showPinButton = True
- super(_dDockPanel, self).__init__(parent, properties,
attProperties, *args, **kwargs)
+ super(_dDockPanel, self).__init__(parent, properties=properties,
+ attProperties=attProperties, *args, **kwargs)
if self.Floating:
self._floatingPosition =
self.GetParent().GetPosition().Get()
self._floatingSize = self.GetParent().GetSize().Get()
Modified: trunk/dabo/ui/uiwx/dDropdownList.py
===================================================================
--- trunk/dabo/ui/uiwx/dDropdownList.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dDropdownList.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -20,7 +20,8 @@
self._choices = []
preClass = wx.PreChoice
- dcm.dControlItemMixin.__init__(self, preClass, parent,
properties, attProperties, *args, **kwargs)
+ dcm.dControlItemMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _initEvents(self):
Modified: trunk/dabo/ui/uiwx/dEditBox.py
===================================================================
--- trunk/dabo/ui/uiwx/dEditBox.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dEditBox.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -23,7 +23,8 @@
preClass = wx.PreTextCtrl
kwargs["style"] = wx.TE_MULTILINE
- tbm.dTextBoxMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ tbm.dTextBoxMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _getInitPropertiesList(self):
Modified: trunk/dabo/ui/uiwx/dEditableList.py
===================================================================
--- trunk/dabo/ui/uiwx/dEditableList.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dEditableList.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -42,8 +42,8 @@
self._upButton = None
self._panel = None
- dcm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties,
- *args, **kwargs)
+ dcm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def GetValue(self):
Modified: trunk/dabo/ui/uiwx/dEditor.py
===================================================================
--- trunk/dabo/ui/uiwx/dEditor.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dEditor.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -273,7 +273,7 @@
self._keyWordsLanguage = ""
self._defaultsSet = False
self._fontFace = None
- self._fontSize = None
+ self._fontSize = 10
self._useBookmarks = False
self._selectionBackColor = None
self._selectionForeColor = None
@@ -284,8 +284,8 @@
stc.StyledTextCtrl.__init__(self, parent, -1,
style = wx.NO_BORDER)
- dcm.dDataControlMixin.__init__(self, name, properties,
attProperties,
- _explicitName=_explicitName, *args, **kwargs)
+ dcm.dDataControlMixin.__init__(self, name,
properties=properties,
+ attProperties=attProperties,
_explicitName=_explicitName, *args, **kwargs)
self._afterInit()
self._printData = wx.PrintData()
Modified: trunk/dabo/ui/uiwx/dForm.py
===================================================================
--- trunk/dabo/ui/uiwx/dForm.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dForm.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -42,7 +42,8 @@
# or a requery is about to happen.
self._checkForChanges = True
- fm.dFormMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ fm.dFormMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
# if self.mainPanel:
# # Can't do this in the _afterInit, as properties
haven't been
@@ -928,7 +929,8 @@
## (Note that it is necessary to run the above blocks each
time, because
## we are modifying the dForm class definition globally.)
- BaseForm.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ BaseForm.__init__(self, preClass, parent,
properties=properties, attProperties=attProperties,
+ *args, **kwargs)
dForm._hackToFrame()
@@ -999,7 +1001,8 @@
kwargs["TinyTitleBar"] = True
kwargs["ShowStatusBar"] = False
kwargs["ShowToolBar"] = False
- BaseForm.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ BaseForm.__init__(self, preClass, parent,
properties=properties, attProperties=attProperties,
+ *args, **kwargs)
def Show(self, show=True):
self._gtk_show_fix(show)
@@ -1017,7 +1020,8 @@
kwargs["ShowSystemMenu"] = False
kwargs["MenuBarClass"] = None
preClass = wx.PreFrame
- BaseForm.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ BaseForm.__init__(self, preClass, parent,
properties=properties, attProperties=attProperties,
+ *args, **kwargs)
def Show(self, show=True):
self._gtk_show_fix(show)
Modified: trunk/dabo/ui/uiwx/dFormMixin.py
===================================================================
--- trunk/dabo/ui/uiwx/dFormMixin.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dFormMixin.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -71,8 +71,8 @@
# Flag to prevent infinite loops when doing field-level
validation
self._fieldValidationControl = None
- super(dFormMixin, self).__init__(preClass, parent, properties,
- attProperties, *args, **kwargs)
+ super(dFormMixin, self).__init__(preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
dabo.ui.callAfter(self._createStatusBar)
self._createToolBar()
Modified: trunk/dabo/ui/uiwx/dGauge.py
===================================================================
--- trunk/dabo/ui/uiwx/dGauge.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dGauge.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -15,7 +15,8 @@
def __init__(self, parent, properties=None, attProperties=None, *args,
**kwargs):
self._baseClass = dGauge
preClass = wx.PreGauge
- cm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ cm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _initEvents(self):
Modified: trunk/dabo/ui/uiwx/dGlWindow.py
===================================================================
--- trunk/dabo/ui/uiwx/dGlWindow.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dGlWindow.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -39,8 +39,8 @@
self._baseClass = dGlWindow
preClass = glcanvas.GLCanvas
- cm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties,
- *args, **kwargs)
+ cm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def initGL(self):
"""Hook function. Put your initial GL code in here."""
Modified: trunk/dabo/ui/uiwx/dGrid.py
===================================================================
--- trunk/dabo/ui/uiwx/dGrid.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dGrid.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -461,7 +461,8 @@
self._gridCellAttrs = {}
- super(dColumn, self).__init__(properties, attProperties, *args,
**kwargs)
+ super(dColumn, self).__init__(properties=properties,
attProperties=attProperties,
+ *args, **kwargs)
self._baseClass = dColumn
@@ -1841,8 +1842,8 @@
self._rowColorEven = "white"
self._rowColorOdd = (212, 255, 212) # very light
green
- cm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties,
- *args, **kwargs)
+ cm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
# Reduces grid flickering on Windows platform.
self._enableDoubleBuffering()
Modified: trunk/dabo/ui/uiwx/dHtmlBox.py
===================================================================
--- trunk/dabo/ui/uiwx/dHtmlBox.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dHtmlBox.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -33,8 +33,8 @@
self._source = self._page = ""
self._respondToLinks = True
self._openLinksInBrowser = False
- cm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties,
- *args, **kwargs)
+ cm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
self.SetScrollRate(10, 10)
if wx.VERSION >= (2, 7):
self.Bind(wx.html.EVT_HTML_LINK_CLICKED,
self.__onWxLinkClicked)
Modified: trunk/dabo/ui/uiwx/dHyperLink.py
===================================================================
--- trunk/dabo/ui/uiwx/dHyperLink.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dHyperLink.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -21,8 +21,8 @@
self._baseClass = dHyperLink
preClass = hyperlink.HyperLinkCtrl
- dcm.dControlMixin.__init__(self, preClass, parent, properties,
- attProperties, *args, **kwargs)
+ dcm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
# Make the rollover effect the default, unless it was specified
as False.
self.ShowHover = self.ShowHover
Modified: trunk/dabo/ui/uiwx/dImage.py
===================================================================
--- trunk/dabo/ui/uiwx/dImage.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dImage.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -36,7 +36,7 @@
self._pictureIndex = self._extractKey((kwargs, properties,
attProperties), "PictureIndex", -1)
dim.dImageMixin.__init__(self)
- dcm.__init__(self, preClass, parent, properties, attProperties,
+ dcm.__init__(self, preClass, parent, properties=properties,
attProperties=attProperties,
bitmap=bmp, *args, **kwargs)
# Display the picture, if any. This will also initialize the
Modified: trunk/dabo/ui/uiwx/dLabel.py
===================================================================
--- trunk/dabo/ui/uiwx/dLabel.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dLabel.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -20,8 +20,8 @@
self._inResizeEvent = False
self._resetAutoResize = True
preClass = wx.PreStaticText
- cm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties,
- *args, **kwargs)
+ cm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
self.bindEvent(dEvents.Resize, self.__onResize)
Modified: trunk/dabo/ui/uiwx/dLine.py
===================================================================
--- trunk/dabo/ui/uiwx/dLine.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dLine.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -23,7 +23,8 @@
self._baseClass = dLine
preClass = wx.PreStaticLine
- cm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ cm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _initEvents(self):
Modified: trunk/dabo/ui/uiwx/dLinePlot.py
===================================================================
--- trunk/dabo/ui/uiwx/dLinePlot.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dLinePlot.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -153,7 +153,8 @@
self._baseClass = dLinePlot
plot.PlotCanvas.__init__(self, parent)
name, _explicitName = self._processName(kwargs,
self.__class__.__name__)
- cm.dControlMixin.__init__(self, name, properties,
attProperties, _explicitName=_explicitName, *args, **kwargs)
+ cm.dControlMixin.__init__(self, name, properties=properties,
+ attProperties=attProperties,
_explicitName=_explicitName, *args, **kwargs)
self.SetPointLabelFunc(self.DrawPointLabel)
Modified: trunk/dabo/ui/uiwx/dListBox.py
===================================================================
--- trunk/dabo/ui/uiwx/dListBox.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dListBox.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -17,7 +17,8 @@
self._choices = []
preClass = wx.PreListBox
- dcm.dControlItemMixin.__init__(self, preClass, parent,
properties, attProperties, *args, **kwargs)
+ dcm.dControlItemMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _initEvents(self):
Modified: trunk/dabo/ui/uiwx/dListControl.py
===================================================================
--- trunk/dabo/ui/uiwx/dListControl.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dListControl.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -76,8 +76,8 @@
except TypeError:
style = wx.LC_REPORT
preClass = wx.PreListCtrl
- dcm.dControlItemMixin.__init__(self, preClass, parent,
properties, attProperties,
- style=style, *args, **kwargs)
+ dcm.dControlItemMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, style=style,
*args, **kwargs)
ListMixin.ListCtrlAutoWidthMixin.__init__(self)
# Dictionary for tracking images by key value
self.__imageList = {}
Modified: trunk/dabo/ui/uiwx/dMaskedTextBox.py
===================================================================
--- trunk/dabo/ui/uiwx/dMaskedTextBox.py 2011-01-22 16:59:01 UTC (rev
6336)
+++ trunk/dabo/ui/uiwx/dMaskedTextBox.py 2011-01-22 17:28:24 UTC (rev
6337)
@@ -85,8 +85,8 @@
kwargs["useFixedWidthFont"] = False
preClass = wx.lib.masked.TextCtrl
- tbm.dTextBoxMixin.__init__(self, preClass, parent, properties,
attProperties,
- *args, **kwargs)
+ tbm.dTextBoxMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def getFormats(cls):
Modified: trunk/dabo/ui/uiwx/dMediaControl.py
===================================================================
--- trunk/dabo/ui/uiwx/dMediaControl.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dMediaControl.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -50,8 +50,8 @@
dropHandler = self._extractKey((properties, kwargs),
"DroppedFileHandler", self)
kwargs["DroppedFileHandler"] = dropHandler
- cm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties,
- *args, **kwargs)
+ cm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
# Create lower-case method names to be consistent with Dabo
# self.play = self.Play
self.pause = self.Pause
Modified: trunk/dabo/ui/uiwx/dMenu.py
===================================================================
--- trunk/dabo/ui/uiwx/dMenu.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dMenu.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -41,7 +41,8 @@
## To work around this, we maintain an internal dictionary
that
## maps the id of the wxMenuItem to the dMenuItem object.
self._daboChildren = {}
- pm.dPemMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ pm.dPemMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def __onMenuOpenMRU(self, evt):
Modified: trunk/dabo/ui/uiwx/dPageFrame.py
===================================================================
--- trunk/dabo/ui/uiwx/dPageFrame.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dPageFrame.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -50,7 +50,8 @@
self._baseClass = dPageFrame
preClass = wx.PreNotebook
- dPageFrameMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ dPageFrameMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _afterInit(self):
if sys.platform[:3] == "win":
@@ -71,7 +72,8 @@
self._baseClass = dPageToolBar
preClass = wx.PreToolbook
- dPageFrameMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ dPageFrameMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _afterInit(self):
if sys.platform[:3] == "win":
@@ -96,7 +98,8 @@
preClass = wx.PreListbook
# Dictionary for tracking images by key value
self._imageList = {}
- dPageFrameMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ dPageFrameMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
self.Bind(wx.EVT_LIST_ITEM_MIDDLE_CLICK, self.__onWxMiddleClick)
self.Bind(wx.EVT_LIST_ITEM_RIGHT_CLICK, self.__onWxRightClick)
@@ -154,7 +157,8 @@
def __init__(self, parent, properties=None, attProperties=None, *args,
**kwargs):
self._baseClass = dPageSelect
preClass = wx.PreChoicebook
- dPageFrameMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ dPageFrameMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
# Dictionary for tracking images by key value
self._imageList = {}
@@ -192,7 +196,8 @@
if "style" in kwargs:
newStyle = kwargs["style"] | newStyle
kwargs["style"] = newStyle
- dPageFrameMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ dPageFrameMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def insertPage(self, pos, pgCls=None, caption="", imgKey=None,
@@ -254,7 +259,8 @@
# explicitly set.
selpg = int(self._extractKey((properties,
attProperties, kwargs), "SelectedPageNumber",
defaultVal=0))
- dPageFrameMixin.__init__(self, preClass, parent,
properties, attProperties, *args, **kwargs)
+ dPageFrameMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args,
**kwargs)
dabo.ui.setAfter(self, "SelectedPageNumber", selpg)
Modified: trunk/dabo/ui/uiwx/dPdfWindow.py
===================================================================
--- trunk/dabo/ui/uiwx/dPdfWindow.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dPdfWindow.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -38,8 +38,8 @@
self._baseClass = dPdfWindow
preClass = pdfwin.PDFWindow
- cm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties,
- *args, **kwargs)
+ cm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
Modified: trunk/dabo/ui/uiwx/dRadioList.py
===================================================================
--- trunk/dabo/ui/uiwx/dRadioList.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dRadioList.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -20,7 +20,8 @@
def __init__(self, parent, properties=None, attProperties=None, *args,
**kwargs):
self._baseClass = _dRadioButton
preClass = wx.PreRadioButton
- dcm.dDataControlMixin.__init__(self, preClass, parent,
properties, attProperties, *args, **kwargs)
+ dcm.dDataControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _initEvents(self):
@@ -149,7 +150,8 @@
# 'ButtonSpacing' property.
self._buttonSpacing = 5
- cim.dControlItemMixin.__init__(self, preClass, parent,
properties, attProperties, *args, **kwargs)
+ cim.dControlItemMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _resetChoices(self):
Modified: trunk/dabo/ui/uiwx/dRichTextBox.py
===================================================================
--- trunk/dabo/ui/uiwx/dRichTextBox.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dRichTextBox.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -30,8 +30,8 @@
self._htmlHandler = wx.richtext.RichTextHTMLHandler()
self._handlers = (self._xmlHandler, self._htmlHandler)
preClass = wx.richtext.PreRichTextCtrl
- dcm.dDataControlMixin.__init__(self, preClass, parent,
properties,
- attProperties, *args, **kwargs)
+ dcm.dDataControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def load(self, fileOrObj=None):
Modified: trunk/dabo/ui/uiwx/dSearchBox.py
===================================================================
--- trunk/dabo/ui/uiwx/dSearchBox.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dSearchBox.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -19,8 +19,8 @@
self._searchVisible = True
preClass = wx.PreSearchCtrl
- tbm.dTextBoxMixin.__init__(self, preClass, parent, properties,
attProperties,
- *args, **kwargs)
+ tbm.dTextBoxMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _initEvents(self):
super(dSearchBox, self)._initEvents()
Modified: trunk/dabo/ui/uiwx/dShell.py
===================================================================
--- trunk/dabo/ui/uiwx/dShell.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dShell.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -148,7 +148,8 @@
self._fontFace = ""
self._baseClass = _Shell
preClass = wx.py.shell.Shell
- dPemMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ dPemMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _afterInit(self):
Modified: trunk/dabo/ui/uiwx/dSlidePanelControl.py
===================================================================
--- trunk/dabo/ui/uiwx/dSlidePanelControl.py 2011-01-22 16:59:01 UTC (rev
6336)
+++ trunk/dabo/ui/uiwx/dSlidePanelControl.py 2011-01-22 17:28:24 UTC (rev
6337)
@@ -52,7 +52,8 @@
"borderonly" : fpb.CAPTIONBAR_RECTANGLE,
"filledborder" :
fpb.CAPTIONBAR_FILLED_RECTANGLE}
- dcm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ dcm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
self._cont.appendPanel(self)
self._cont.RedisplayFoldPanelItems()
@@ -400,7 +401,8 @@
# Ensures that the control has a minimum size.
self._minSizerWidth = self._minSizerHeight = 100
- dcm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ dcm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
self._setInitialOpenPanel()
self.bindEvent(dEvents.SlidePanelChange,
self.__onSlidePanelChange)
Modified: trunk/dabo/ui/uiwx/dSlider.py
===================================================================
--- trunk/dabo/ui/uiwx/dSlider.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dSlider.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -29,7 +29,8 @@
self._reversed = False
preClass = wx.PreSlider
- dcm.dDataControlMixin.__init__(self, preClass, parent,
properties, attProperties, *args, **kwargs)
+ dcm.dDataControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _initProperties(self):
Modified: trunk/dabo/ui/uiwx/dSpinner.py
===================================================================
--- trunk/dabo/ui/uiwx/dSpinner.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dSpinner.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -23,8 +23,8 @@
self._baseClass = _dSpinButton
preClass = wx.PreSpinButton
kwargs["style"] = kwargs.get("style", 0) | wx.SP_ARROW_KEYS
- dcm.dDataControlMixin.__init__(self, preClass, parent,
properties, attProperties,
- *args, **kwargs)
+ dcm.dDataControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
class dSpinner(dabo.ui.dDataPanel, wx.Control):
Modified: trunk/dabo/ui/uiwx/dSplitter.py
===================================================================
--- trunk/dabo/ui/uiwx/dSplitter.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dSplitter.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -141,8 +141,8 @@
self._showPanelSplitMenu = False
preClass = wx.PreSplitterWindow
- cm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties,
- style=style, *args, **kwargs)
+ cm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, style=style,
*args, **kwargs)
def _initEvents(self):
Modified: trunk/dabo/ui/uiwx/dStatusBar.py
===================================================================
--- trunk/dabo/ui/uiwx/dStatusBar.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dStatusBar.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -20,8 +20,8 @@
preClass = wx.PreStatusBar
self._platformIsWindows = (self.Application.Platform == "Win")
self._fieldCount = 1
- dcm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties,
- *args, **kwargs)
+ dcm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def layout(self):
Modified: trunk/dabo/ui/uiwx/dTextBox.py
===================================================================
--- trunk/dabo/ui/uiwx/dTextBox.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dTextBox.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -15,8 +15,8 @@
self._baseClass = dTextBox
preClass = wx.PreTextCtrl
- tbm.dTextBoxMixin.__init__(self, preClass, parent, properties,
attProperties,
- *args, **kwargs)
+ tbm.dTextBoxMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
Modified: trunk/dabo/ui/uiwx/dTextBoxMixin.py
===================================================================
--- trunk/dabo/ui/uiwx/dTextBoxMixin.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dTextBoxMixin.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -35,7 +35,8 @@
self._inTextLength = False
self._flushOnLostFocus = True ## see
dabo.ui.dDataControlMixinBase::flushValue()
- dcm.dDataControlMixin.__init__(self, preClass, parent,
properties, attProperties, *args, **kwargs)
+ dcm.dDataControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _initEvents(self):
@@ -463,7 +464,8 @@
self._dregex = {}
self._lastDataType = unicode
- dTextBoxMixinBase.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ dTextBoxMixinBase.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
# Keep passwords, etc., from being written to disk
if self.PasswordEntry:
Modified: trunk/dabo/ui/uiwx/dToggleButton.py
===================================================================
--- trunk/dabo/ui/uiwx/dToggleButton.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dToggleButton.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -35,7 +35,8 @@
style = self._extractKey((properties, attProperties, kwargs),
"style", 0) | wx.BORDER_NONE
kwargs["style"] = style
dim.dImageMixin.__init__(self)
- dcm.dDataControlMixin.__init__(self, preClass, parent,
properties, attProperties, *args, **kwargs)
+ dcm.dDataControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
self.Bind(wx.EVT_BUTTON, self.__onButton)
Modified: trunk/dabo/ui/uiwx/dToolBar.py
===================================================================
--- trunk/dabo/ui/uiwx/dToolBar.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dToolBar.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -41,7 +41,8 @@
# Need this to load/convert image files to bitmaps
self._image = wx.NullImage
- cm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties, *args, **kwargs)
+ cm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, *args, **kwargs)
def _initProperties(self):
Modified: trunk/dabo/ui/uiwx/dTreeView.py
===================================================================
--- trunk/dabo/ui/uiwx/dTreeView.py 2011-01-22 16:59:01 UTC (rev 6336)
+++ trunk/dabo/ui/uiwx/dTreeView.py 2011-01-22 17:28:24 UTC (rev 6337)
@@ -411,8 +411,8 @@
style = style | wx.TR_LINES_AT_ROOT
preClass = wx.PreTreeCtrl
- dcm.dControlMixin.__init__(self, preClass, parent, properties,
attProperties, style=style,
- *args, **kwargs)
+ dcm.dControlMixin.__init__(self, preClass, parent,
properties=properties,
+ attProperties=attProperties, style=style,
*args, **kwargs)
def _initEvents(self):
_______________________________________________
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]
