Fix conflict

gui/characterEditor.py

@@ -66,14 +66,11 @@ class CharacterEditor(wx.Frame):
 
         self.navSizer.Add(self.skillTreeChoice, 1, wx.ALL | wx.EXPAND, 5)
 
-        buttons = (("new", wx.ART_NEW),
-                   ("copy", wx.ART_COPY),
-                   ("rename", bitmapLoader.getBitmap("rename", "icons")),
-                   ("delete", wx.ART_DELETE))
-
+        buttons = (("new", wx.ART_NEW), ("copy", wx.ART_COPY), ("rename", bitmapLoader.getBitmap("rename", "icons")), ("delete", wx.ART_DELETE))
+        
         size = None
         for name, art in buttons:
-            bitmap = wx.ArtProvider.GetBitmap(art) if isinstance(art, unicode) else art
+            bitmap = wx.ArtProvider.GetBitmap(art, wx.ART_BUTTON) if name != "rename" else art
             btn = wx.BitmapButton(self, wx.ID_ANY, bitmap)
             if size is None:
                 size = btn.GetSize()

gui/mainFrame.py

@@ -52,7 +52,6 @@ class MainFrame(wx.Frame):
         self.SetMinSize((1000, 700))
         self.SetSize((1000, 700))
 
-
         self.splitter = wx.SplitterWindow(self, style = wx.SP_LIVE_UPDATE)
 
         self.notebookBrowsers = wx.Notebook(self.splitter, wx.ID_ANY)

gui/marketBrowser.py

@@ -138,6 +138,7 @@ class MarketBrowser(wx.Panel):
                 getattr(self, btn).SetValue(False)
                 cMarket.disableMetaGroup(btn)
 
+
             metaGroup = cMarket.getMetaName(item.metaGroup.ID)
             getattr(self, metaGroup).SetValue(True)
             cMarket.activateMetaGroup(metaGroup)