diff -r 750eeb7230a1 -r c02818d7e29f util/BitmapLibrary.py --- a/util/BitmapLibrary.py Mon Aug 14 22:23:17 2017 +0300 +++ b/util/BitmapLibrary.py Mon Aug 14 22:30:41 2017 +0300 @@ -47,24 +47,24 @@ if os.path.isfile(bmp_path): return wx.Bitmap(bmp_path) return None - + def GetBitmap(bmp_name1, bmp_name2=None, size=None): bmp = BitmapLibrary.get((bmp_name1, bmp_name2, size)) if bmp is not None: return bmp - + if bmp_name2 is None: bmp = SearchBitmap(bmp_name1) else: # Bitmap with two icon bmp1 = SearchBitmap(bmp_name1) bmp2 = SearchBitmap(bmp_name2) - + if bmp1 is not None and bmp2 is not None: # Calculate bitmap size width = bmp1.GetWidth() + bmp2.GetWidth() - 1 height = max(bmp1.GetHeight(), bmp2.GetHeight()) - + # Create bitmap with both icons bmp = wx.EmptyBitmap(width, height) dc = wx.MemoryDC() @@ -73,13 +73,13 @@ dc.DrawBitmap(bmp1, 0, 0) dc.DrawBitmap(bmp2, bmp1.GetWidth() - 1, 0) dc.Destroy() - + elif bmp1 is not None: bmp = bmp1 elif bmp2 is not None: bmp = bmp2 - + if bmp is not None: BitmapLibrary[(bmp_name1, bmp_name2, size)] = bmp - + return bmp