From f07b0172eba2e79c3912f3d7fdf394ddd44da103 Mon Sep 17 00:00:00 2001
From: HomeWorld <homeworld@gmail.com>
Date: Tue, 2 Nov 2010 17:45:42 +0200
Subject: [PATCH] Fix the fix of the fixing fix.

---
 gui/display.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gui/display.py b/gui/display.py
index c4aec80e1..c9b37d54d 100644
--- a/gui/display.py
+++ b/gui/display.py
@@ -142,8 +142,20 @@ class Display(wx.ListCtrl):
                 self.SetItemData(item, id)
 
         self.Freeze()
-        for i,col in enumerate(self.activeColumns):
-            self.SetColumnWidth(i, col.size)
+        if 'wxMSW' in wx.PlatformInfo:
+            for i,col in enumerate(self.activeColumns):
+                self.SetColumnWidth(i, col.size)
+        else:
+            for i, col in enumerate(self.activeColumns):
+                if col.size == wx.LIST_AUTOSIZE_USEHEADER:
+                    self.SetColumnWidth(i, wx.LIST_AUTOSIZE_USEHEADER)
+                    headerWidth = self.GetColumnWidth(i)
+                    self.SetColumnWidth(i, wx.LIST_AUTOSIZE)
+                    baseWidth = self.GetColumnWidth(i)
+                    if baseWidth < headerWidth:
+                        self.SetColumnWidth(i, headerWidth)
+                else:
+                    self.SetColumnWidth(i, col.size)
         self.Thaw()
 
         for sel in selection: