equal
deleted
inserted
replaced
905 dc = wx.MemoryDC() |
905 dc = wx.MemoryDC() |
906 dc.SelectObject(tmp_bitmap) |
906 dc.SelectObject(tmp_bitmap) |
907 dc.Clear() |
907 dc.Clear() |
908 dc.DrawBitmap(icon1, 0, 0) |
908 dc.DrawBitmap(icon1, 0, 0) |
909 dc.DrawBitmap(icon2, icon1.GetWidth() - 1, 0) |
909 dc.DrawBitmap(icon2, icon1.GetWidth() - 1, 0) |
910 # Store bitmap in ImageList |
910 if wx.Platform != '__WXMSW__': |
911 index = self.TabsImageList.Add(tmp_bitmap) |
911 # Store bitmap in ImageList |
912 # Save bitmap index in ImageList in dictionary |
912 index = self.TabsImageList.Add(tmp_bitmap) |
913 self.TabsImageListIndexes[(icon1_name, icon2_name)] = index |
913 # Save bitmap index in ImageList in dictionary |
|
914 self.TabsImageListIndexes[(icon1_name, icon2_name)] = index |
914 if USE_AUI: |
915 if USE_AUI: |
915 return tmp_bitmap |
916 return tmp_bitmap |
916 else: |
917 else: |
917 return index |
918 return index |
918 |
919 |