Commit e03753e2b43046be8ac0ae93ea91e56cc3b344c3
1 parent
02bd4370
Exists in
mactoolbar_bkp
Converted LayoutToolbar to auitoolbar
Showing
1 changed file
with
11 additions
and
7 deletions
Show diff stats
invesalius/gui/frame.py
... | ... | @@ -1394,7 +1394,7 @@ class LayoutToolBar(AuiToolBar): |
1394 | 1394 | """ |
1395 | 1395 | def __init__(self, parent): |
1396 | 1396 | style = wx.TB_FLAT|wx.TB_NODIVIDER | wx.TB_DOCKABLE |
1397 | - wx.ToolBar.__init__(self, parent, -1, wx.DefaultPosition, | |
1397 | + AuiToolBar.__init__(self, parent, -1, wx.DefaultPosition, | |
1398 | 1398 | wx.DefaultSize, |
1399 | 1399 | style) |
1400 | 1400 | |
... | ... | @@ -1462,14 +1462,18 @@ class LayoutToolBar(AuiToolBar): |
1462 | 1462 | p = os.path.join(d, "text.png") |
1463 | 1463 | self.BMP_WITH_TEXT = wx.Bitmap(p, wx.BITMAP_TYPE_PNG) |
1464 | 1464 | |
1465 | - self.AddLabelTool(ID_LAYOUT, | |
1465 | + self.AddTool(ID_LAYOUT, | |
1466 | 1466 | "", |
1467 | - bitmap=self.BMP_WITHOUT_MENU, | |
1468 | - shortHelp= _("Hide task panel")) | |
1469 | - self.AddLabelTool(ID_TEXT, | |
1467 | + self.BMP_WITHOUT_MENU, | |
1468 | + wx.NullBitmap, | |
1469 | + wx.ITEM_NORMAL, | |
1470 | + short_help_string= _("Hide task panel")) | |
1471 | + self.AddTool(ID_TEXT, | |
1470 | 1472 | "", |
1471 | - bitmap=self.BMP_WITH_TEXT, | |
1472 | - shortHelp= _("Hide text")) | |
1473 | + self.BMP_WITH_TEXT, | |
1474 | + wx.NullBitmap, | |
1475 | + wx.ITEM_NORMAL, | |
1476 | + short_help_string= _("Hide text")) | |
1473 | 1477 | |
1474 | 1478 | def _EnableState(self, pubsub_evt): |
1475 | 1479 | """ | ... | ... |