Changeset 3255

Show
Ignore:
Timestamp:
07/16/07 00:34:58 (1 year ago)
Author:
paul
Message:

Fixed _imageList to be instantiated earlier in the init phase. Also fixed
the fact that the pageframe classes were calling controlmixin.init
directly instead of going through dPageFrameMixin first.

Thanks, Nate, for catching the _imageList problem.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/stable/dabo/ui/uiwx/dPageFrame.py

    r3054 r3255  
    88    dabo.ui.loadUI("wx") 
    99 
    10 import dControlMixin as cm 
    1110import dPage 
    1211import dabo.dEvents as dEvents 
    …… 
    3635        preClass = wx.PreNotebook 
    3736         
    38         cm.dControlMixin.__init__(self, preClass, parent, properties, attProperties, *args, **kwargs) 
    39         # Dictionary for tracking images by key value 
    40         self._imageList = {} 
     37        dPageFrameMixin.__init__(self, preClass, parent, properties, attProperties, *args, **kwargs) 
    4138 
    4239 
    …… 
    6158        # Dictionary for tracking images by key value 
    6259        self._imageList = {} 
    63         cm.dControlMixin.__init__(self, preClass, parent, properties, attProperties, *args, **kwargs) 
     60        dPageFrameMixin.__init__(self, preClass, parent, properties, attProperties, *args, **kwargs) 
     61 
    6462        self.Bind(wx.EVT_LIST_ITEM_MIDDLE_CLICK, self.__onWxMiddleClick) 
    6563        self.Bind(wx.EVT_LIST_ITEM_RIGHT_CLICK, self.__onWxRightClick) 
    …… 
    106104        self._baseClass = dPageSelect 
    107105        preClass = wx.PreChoicebook 
    108         cm.dControlMixin.__init__(self, preClass, parent, properties, attProperties, *args, **kwargs) 
     106        dPageFrameMixin.__init__(self, preClass, parent, properties, attProperties, *args, **kwargs) 
    109107        # Dictionary for tracking images by key value 
    110108        self._imageList = {} 

  • branches/stable/dabo/ui/uiwx/dPageFrameMixin.py

    r3054 r3255  
    1616    """Creates a container for an unlimited number of pages.""" 
    1717    def _beforeInit(self, pre): 
     18        self._imageList = {} 
    1819        self._pageSizerClass = dabo.ui.dSizer 
    1920        super(dPageFrameMixin, self)._beforeInit(pre)