Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 797bc029d614

Parents b487ed3e4174

Parents bb2aa283662f

by Adrian Buehlmann

Changes to one file · Browse files at 797bc029d614 Showing diff from parent b487ed3e4174 bb2aa283662f Diff from another changeset...

 
870
871
872
 
 
 
 
873
874
875
 
885
886
887
888
 
 
889
890
891
 
870
871
872
873
874
875
876
877
878
879
 
889
890
891
 
892
893
894
895
896
@@ -870,6 +870,10 @@
  args: an argument list for 'handler' parameter.   Default: [] (an empty list).   """ + use_underline = kargs.get('use_underline', True) + if gtk.gtk_version < (2, 14, 0) and not use_underline: + # workaround (set_use_underline not available on gtk < 2.14) + label = label.replace('_', '__')   if kargs.get('asradio') or kargs.get('ascheck'):   if kargs.get('asradio'):   menu = gtk.RadioMenuItem(kargs.get('group'), label) @@ -885,7 +889,8 @@
  args = kargs.get('args', [])   menu.connect('activate', handler, *args)   menu.set_sensitive(kargs.get('sensitive', True)) - menu.set_use_underline(kargs.get('use_underline', True)) + if gtk.gtk_version >= (2, 14, 0): + menu.set_use_underline(use_underline)   menu.set_border_width(1)   return menu