Download as
Browse Code »

Commit 752dd14220a72738ffd2007287709285f54e7c34

Authored by Thiago Franco de Moraes
1 parent 83bf6589
Exists in wx2.9_mac

solved the problem with icon size

Showing 1 changed file with 5 additions and 5 deletions   Show diff stats
invesalius/gui/frame.py
  Diff comments   View file @752dd14
@@ -862,7 +862,7 @@ class ProjectToolBar(wx.ToolBar): @@ -862,7 +862,7 @@ class ProjectToolBar(wx.ToolBar):
862 """ 862 """
863 # Load bitmaps 863 # Load bitmaps
864 d = const.ICON_DIR 864 d = const.ICON_DIR
865 - if sys.platform == 'darwin': 865 + if sys.platform == 'darwin' and wx.VERSION < (2, 9):
866 path = os.path.join(d,"file_from_internet_original.png") 866 path = os.path.join(d,"file_from_internet_original.png")
867 BMP_NET = wx.Bitmap(path, wx.BITMAP_TYPE_PNG) 867 BMP_NET = wx.Bitmap(path, wx.BITMAP_TYPE_PNG)
868 868
@@ -1002,7 +1002,7 @@ class ObjectToolBar(wx.ToolBar): @@ -1002,7 +1002,7 @@ class ObjectToolBar(wx.ToolBar):
1002 Add tools into toolbar. 1002 Add tools into toolbar.
1003 """ 1003 """
1004 d = const.ICON_DIR 1004 d = const.ICON_DIR
1005 - if sys.platform == 'darwin': 1005 + if sys.platform == 'darwin' and wx.VERSION < (2, 9):
1006 path = os.path.join(d, "tool_rotate_original.png") 1006 path = os.path.join(d, "tool_rotate_original.png")
1007 BMP_ROTATE = wx.Bitmap(path, wx.BITMAP_TYPE_PNG) 1007 BMP_ROTATE = wx.Bitmap(path, wx.BITMAP_TYPE_PNG)
1008 1008
@@ -1213,7 +1213,7 @@ class SliceToolBar(wx.ToolBar): @@ -1213,7 +1213,7 @@ class SliceToolBar(wx.ToolBar):
1213 Add tools into toolbar. 1213 Add tools into toolbar.
1214 """ 1214 """
1215 d = const.ICON_DIR 1215 d = const.ICON_DIR
1216 - if sys.platform == 'darwin': 1216 + if sys.platform == 'darwin' and wx.VERSION < (2, 9):
1217 path = os.path.join(d, "slice_original.png") 1217 path = os.path.join(d, "slice_original.png")
1218 BMP_SLICE = wx.Bitmap(path, wx.BITMAP_TYPE_PNG) 1218 BMP_SLICE = wx.Bitmap(path, wx.BITMAP_TYPE_PNG)
1219 1219
@@ -1356,7 +1356,7 @@ class LayoutToolBar(wx.ToolBar): @@ -1356,7 +1356,7 @@ class LayoutToolBar(wx.ToolBar):
1356 Add tools into toolbar. 1356 Add tools into toolbar.
1357 """ 1357 """
1358 d = const.ICON_DIR 1358 d = const.ICON_DIR
1359 - if sys.platform == 'darwin': 1359 + if sys.platform == 'darwin' and wx.VERSION < (2, 9):
1360 # Bitmaps for show/hide task panel item 1360 # Bitmaps for show/hide task panel item
1361 p = os.path.join(d, "layout_data_only_original.gif") 1361 p = os.path.join(d, "layout_data_only_original.gif")
1362 self.BMP_WITH_MENU = wx.Bitmap(p, wx.BITMAP_TYPE_GIF) 1362 self.BMP_WITH_MENU = wx.Bitmap(p, wx.BITMAP_TYPE_GIF)
@@ -1534,7 +1534,7 @@ class HistoryToolBar(wx.ToolBar): @@ -1534,7 +1534,7 @@ class HistoryToolBar(wx.ToolBar):
1534 Add tools into toolbar. 1534 Add tools into toolbar.
1535 """ 1535 """
1536 d = const.ICON_DIR 1536 d = const.ICON_DIR
1537 - if sys.platform == 'darwin': 1537 + if sys.platform == 'darwin' and wx.VERSION < (2, 9):
1538 # Bitmaps for show/hide task panel item 1538 # Bitmaps for show/hide task panel item
1539 p = os.path.join(d, "undo_original.png") 1539 p = os.path.join(d, "undo_original.png")
1540 self.BMP_UNDO = wx.Bitmap(p, wx.BITMAP_TYPE_PNG) 1540 self.BMP_UNDO = wx.Bitmap(p, wx.BITMAP_TYPE_PNG)