gnue/forms/src/uidrivers/wx MenuBar.py

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/03/03 10:22:01

Modified files:
        forms/src/uidrivers/wx: MenuBar.py 

Log message:
        yet more fixes for wxPython 2.2

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/MenuBar.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/wx/MenuBar.py
diff -c gnue/forms/src/uidrivers/wx/MenuBar.py:1.2 
gnue/forms/src/uidrivers/wx/MenuBar.py:1.3
*** gnue/forms/src/uidrivers/wx/MenuBar.py:1.2  Sat Mar  1 15:29:33 2003
--- gnue/forms/src/uidrivers/wx/MenuBar.py      Mon Mar  3 10:22:01 2003
***************
*** 65,81 ****
      event = 'request' + userAction.event
      EVT_MENU(self.driver._wxapp, id,
        lambda event, l=self.driver, e=event, f=self.form: 
l.dispatchEvent(e,_form=f))
!         
      # Set the action icon if available
!     if iconloc: 
!       try: 
          # Some caching logic for faster second/third forms
          icon = _cachedIcons[iconloc]
!       except KeyError: 
          icon = wxImage(iconloc, wxBITMAP_TYPE_PNG).ConvertToBitmap()
          _cachedIcons[iconloc] = icon
!       item.SetBitmap(icon)
!     
      parent.AppendItem(item)
      parent.SetLabel(id, label)
      return item
--- 65,85 ----
      event = 'request' + userAction.event
      EVT_MENU(self.driver._wxapp, id,
        lambda event, l=self.driver, e=event, f=self.form: 
l.dispatchEvent(e,_form=f))
! 
      # Set the action icon if available
!     if iconloc:
!       try:
          # Some caching logic for faster second/third forms
          icon = _cachedIcons[iconloc]
!       except KeyError:
          icon = wxImage(iconloc, wxBITMAP_TYPE_PNG).ConvertToBitmap()
          _cachedIcons[iconloc] = icon
!       try:
!         item.SetBitmap(icon)
!       except AttributeError:
!         # Good ol' wx 2.2 address@hidden@#
!         pass
! 
      parent.AppendItem(item)
      parent.SetLabel(id, label)
      return item