From 2cac5adf8d418d8e1996d9397736b2966608604a Mon Sep 17 00:00:00 2001
From: HomeWorld <homeworld@gmail.com>
Date: Sat, 11 Dec 2010 00:45:09 +0200
Subject: [PATCH] Use stored bitmaps for viewcolumns headers (required to get a
 proper fitting view snapshot)

---
 gui/builtinViewColumns/ammo.py             | 1 +
 gui/builtinViewColumns/attributeDisplay.py | 1 +
 gui/builtinViewColumns/capacitorUse.py     | 1 +
 gui/builtinViewColumns/maxRange.py         | 1 +
 gui/builtinViewColumns/price.py            | 2 +-
 gui/builtinViewColumns/tracking.py         | 1 +
 gui/builtinViews/fittingView.py            | 2 +-
 gui/viewColumn.py                          | 2 +-
 8 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gui/builtinViewColumns/ammo.py b/gui/builtinViewColumns/ammo.py
index 3bc39d45b..0705699d0 100644
--- a/gui/builtinViewColumns/ammo.py
+++ b/gui/builtinViewColumns/ammo.py
@@ -28,6 +28,7 @@ class Ammo(ViewColumn):
         ViewColumn.__init__(self, fittingView)
         self.mask = wx.LIST_MASK_IMAGE
         self.imageId = fittingView.imageList.GetImageIndex("damagePattern_small", "icons")
+        self.bitmap = bitmapLoader.getBitmap("damagePattern_small", "icons")
 
     def getText(self, stuff):
         return "%s (%s)" % (stuff.charge.name, stuff.numCharges) if getattr(stuff, "charge", None) is not None else ""
diff --git a/gui/builtinViewColumns/attributeDisplay.py b/gui/builtinViewColumns/attributeDisplay.py
index 47e402e8c..a72ed7143 100644
--- a/gui/builtinViewColumns/attributeDisplay.py
+++ b/gui/builtinViewColumns/attributeDisplay.py
@@ -40,6 +40,7 @@ class AttributeDisplay(ViewColumn):
                 iconType = "pack"
             if iconFile:
                 self.imageId = fittingView.imageList.GetImageIndex(iconFile, iconType)
+                self.bitmap = bitmapLoader.getBitmap(iconFile, iconType)
             else:
                 self.imageId = -1
 
diff --git a/gui/builtinViewColumns/capacitorUse.py b/gui/builtinViewColumns/capacitorUse.py
index 309433c0d..68e5fb355 100644
--- a/gui/builtinViewColumns/capacitorUse.py
+++ b/gui/builtinViewColumns/capacitorUse.py
@@ -34,6 +34,7 @@ class CapacitorUse(ViewColumn):
         cAttribute = service.Attribute.getInstance()
         info = cAttribute.getAttributeInfo("capacitorNeed")
         self.imageId = fittingView.imageList.GetImageIndex(info.icon.iconFile, "pack")
+        self.bitmap = bitmapLoader.getBitmap(info.icon.iconFile, "pack")
 
 
     def getText(self, mod):
diff --git a/gui/builtinViewColumns/maxRange.py b/gui/builtinViewColumns/maxRange.py
index eb27cc3b3..4fcee9d4e 100644
--- a/gui/builtinViewColumns/maxRange.py
+++ b/gui/builtinViewColumns/maxRange.py
@@ -39,6 +39,7 @@ class MaxRange(ViewColumn):
             iconFile = info.icon.iconFile if info.icon else None
             if iconFile:
                 self.imageId = fittingView.imageList.GetImageIndex(iconFile, "pack")
+                self.bitmap = bitmapLoader.getBitmap(iconFile, "pack")
             else:
                 self.imageId = -1
             self.mask = wx.LIST_MASK_IMAGE
diff --git a/gui/builtinViewColumns/price.py b/gui/builtinViewColumns/price.py
index 5a370cf42..9c21b1f63 100644
--- a/gui/builtinViewColumns/price.py
+++ b/gui/builtinViewColumns/price.py
@@ -28,7 +28,7 @@ class Price(ViewColumn):
     def __init__(self, fittingView, params):
         ViewColumn.__init__(self, fittingView)
         self.mask = wx.LIST_MASK_IMAGE
-        bitmap = bitmapLoader.getBitmap("totalPrice_small", "icons")
+        self.bitmap = bitmapLoader.getBitmap("totalPrice_small", "icons")
         self.imageId = fittingView.imageList.GetImageIndex("totalPrice_small", "icons")
 
     def getText(self, stuff):
diff --git a/gui/builtinViewColumns/tracking.py b/gui/builtinViewColumns/tracking.py
index 6b43b0930..6640ea721 100644
--- a/gui/builtinViewColumns/tracking.py
+++ b/gui/builtinViewColumns/tracking.py
@@ -39,6 +39,7 @@ class Tracking(ViewColumn):
             iconFile = info.icon.iconFile if info.icon else None
             if iconFile:
                 self.imageId = fittingView.imageList.GetImageIndex(iconFile, "pack")
+                self.bitmap = bitmapLoader.getBitmap(iconFile, "pack")
             else:
                 self.imageId = -1
 
diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py
index 30c6677cf..4f20df9d6 100644
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -528,7 +528,7 @@ class FittingView(d.Display):
                 opts.m_labelText = name
 
             if imgId != -1:
-                bmp = self.imageList.GetBitmap(imgId)
+                bmp = col.bitmap
                 opts.m_labelBitmap = bmp
 
             width = render.DrawHeaderButton (self, mdc, (cx, padding, columnsWidths[i], headerSize), wx.CONTROL_CURRENT,
diff --git a/gui/viewColumn.py b/gui/viewColumn.py
index fec1f9293..294395e87 100644
--- a/gui/viewColumn.py
+++ b/gui/viewColumn.py
@@ -33,7 +33,7 @@ class ViewColumn(object):
         self.size = wx.LIST_AUTOSIZE_USEHEADER
         self.mask = 0
         self.maxsize = -1
-
+        self.bitmap = wx.NullBitmap
 
     @classmethod
     def register(cls):