From 0eda6883519e31b0cf8fd86c009a2304ef8de93b Mon Sep 17 00:00:00 2001
From: HomeWorld <homeworld@gmail.com>
Date: Tue, 7 Dec 2010 14:35:37 +0200
Subject: [PATCH] Display class now uses CachingImageList instead of
 wx.ImageList; updated builtinViewColumns.state to use it properly

---
 gui/builtinViewColumns/state.py | 3 +--
 gui/display.py                  | 7 +++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gui/builtinViewColumns/state.py b/gui/builtinViewColumns/state.py
index 06d5ae869..fb4ae7360 100644
--- a/gui/builtinViewColumns/state.py
+++ b/gui/builtinViewColumns/state.py
@@ -51,8 +51,7 @@ class State(ViewColumn):
             if stuff.isEmpty:
                 return -1
             else:
-                bitmap = bitmapLoader.getBitmap("state_%s_small" % State_.getName(stuff.state).lower(), "icons")
-                return self.fittingView.imageList.Add(bitmap)
+                return self.fittingView.imageList.GetImageIndex("state_%s_small" % State_.getName(stuff.state).lower(), "icons")
         else:
             active = getattr(stuff, "active", None)
             if active is None:
diff --git a/gui/display.py b/gui/display.py
index ab5e4bd0a..e799e19a8 100644
--- a/gui/display.py
+++ b/gui/display.py
@@ -17,16 +17,19 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 #===============================================================================
 
+import sys
 import wx
 import gui.mainFrame
+
 from gui.viewColumn import ViewColumn
-import sys
+from gui.cachingImageList import CachingImageList
+
 
 class Display(wx.ListCtrl):
     def __init__(self, parent, size = wx.DefaultSize, style = 0):
 
         wx.ListCtrl.__init__(self, parent,size = size, style=wx.LC_REPORT |  style )
-        self.imageList = wx.ImageList(16, 16)
+        self.imageList = CachingImageList(16, 16)
         self.SetImageList(self.imageList, wx.IMAGE_LIST_SMALL)
         self.activeColumns = []
         self.columnsMinWidth = []