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

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-forms
Branch:         
Changes by:     Jason Cater <address@hidden>    03/08/05 11:39:28

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

Log message:
        possible fix for hotkey label issue inder GTK+wx+i18n

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

Patches:
Index: gnue-forms/src/uidrivers/wx/MenuBar.py
diff -c gnue-forms/src/uidrivers/wx/MenuBar.py:1.5 
gnue-forms/src/uidrivers/wx/MenuBar.py:1.6
*** gnue-forms/src/uidrivers/wx/MenuBar.py:1.5  Mon Mar  3 17:23:13 2003
--- gnue-forms/src/uidrivers/wx/MenuBar.py      Tue Aug  5 11:39:28 2003
***************
*** 52,58 ****
    
    # Add a menu item (action)
    def addAction(self, name, parent, userAction):
!     label = name
      hotkey = userAction.getHotKeyText()
      iconloc = userAction.getIconLocation(size="16x16")
  
--- 52,58 ----
    
    # Add a menu item (action)
    def addAction(self, name, parent, userAction):
!     label = altlabel = name
      hotkey = userAction.getHotKeyText()
      iconloc = userAction.getIconLocation(size="16x16")
  
***************
*** 81,99 ****
          pass
  
      parent.AppendItem(item)
-     parent.SetLabel(id, label)
-     return item
      
    # Add a separator
!   def addSeparator(self, parent): 
      parent.AppendSeparator()
!     
    # Enable a menu item
    def enableItem(self, item):
      item.Enable(1)
!   
    # Disable a menu item
!   def disableItem(self, item): 
      item.Enable(0)
  
  _cachedIcons = {}
--- 81,104 ----
          pass
  
      parent.AppendItem(item)
      
+     try:
+       parent.SetLabel(id, label)
+     except:
+       # Some i18n installations of WX don't like our hotkeys!
+       parent.SetLabel(id, altlabel)
+     return item
+ 
    # Add a separator
!   def addSeparator(self, parent):
      parent.AppendSeparator()
! 
    # Enable a menu item
    def enableItem(self, item):
      item.Enable(1)
! 
    # Disable a menu item
!   def disableItem(self, item):
      item.Enable(0)
  
  _cachedIcons = {}