X-Git-Url: http://iramuteq.org/git?a=blobdiff_plain;ds=sidebyside;f=tree.py;h=4b61d847a86add1f71fc99c13d776baa12738b36;hb=8cac79f863647b171a7de26478fa85dc358b80e4;hp=49e086d1ac3b492094f882d333647edfdde4c702;hpb=eaa044d1147e26b82942ce56d5965c83fdddf069;p=iramuteq
diff --git a/tree.py b/tree.py
index 49e086d..4b61d84 100755
--- a/tree.py
+++ b/tree.py
@@ -44,7 +44,7 @@ def buildmenu(menu, parent_menu):
for i in range(parent_menu.GetMenuItemCount()) :
item = parent_menu.FindItemByPosition(i)
itemid = item.GetId()
- itemtext = item.GetText()
+ itemtext = item.GetItemLabelText()
itemicon = item.GetBitmap()
nitem = wx.MenuItem(menu, itemid, itemtext)
nitem.SetBitmap(itemicon)
@@ -52,12 +52,12 @@ def buildmenu(menu, parent_menu):
nmenu = wx.Menu()
for val in item.GetSubMenu().GetMenuItems() :
itemid = val.GetId()
- itemtext = val.GetText()
+ itemtext = val.GetItemLabelText()
itemicon = val.GetBitmap()
nitem = wx.MenuItem(menu, itemid, itemtext)
nitem.SetBitmap(itemicon)
nmenu.Append(nitem)
- menu.Append(-1, item.GetText(), nmenu)
+ menu.Append(-1, item.GetItemLabelText(), nmenu)
else :
menu.Append(nitem)
@@ -124,10 +124,9 @@ class LeftTree(CT.CustomTreeCtrl):
agwStyle=CT.TR_HIDE_ROOT|CT.TR_HAS_BUTTONS|CT.TR_HAS_VARIABLE_ROW_HEIGHT):
CT.CustomTreeCtrl.__init__(self, parent, id, pos, size, style, agwStyle)
#FIXME : test for bigger font on HIDPI screen
- font = wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD,
- False, "", wx.FONTENCODING_DEFAULT)
- #font = wx.Font(pointSize=12, family=wx.FONTFAMILY_DEFAULT, style=wx.FONTSTYLE_NORMAL, weight=wx.FONTWEIGHT_BOLD)
- # underline=False, face="", encoding=wx.FONTENCODING_DEFAULT)
+ #font = wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD,
+ # False, "", wx.FONTENCODING_DEFAULT)
+ font = wx.Font(pointSize=10, family=wx.FONTFAMILY_DEFAULT, style=wx.FONTSTYLE_NORMAL, weight=wx.FONTWEIGHT_NORMAL)
self.SetFont(font)
##################
self.log = log
@@ -569,7 +568,7 @@ class LeftTree(CT.CustomTreeCtrl):
ucis_txt, ucestxt = doconcorde(corpus, nuces, page.la, uci = uci)
items = ['
'.join([ucis_txt[j], '
score : %.2f |