From 78d1c80398022ae069ae7b7dae8b598c31924cdd Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Sun, 24 Oct 2010 15:08:10 +0200 Subject: [PATCH] Fix conflict --- gui/characterEditor.py | 9 +++------ gui/mainFrame.py | 1 - gui/marketBrowser.py | 1 + 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/gui/characterEditor.py b/gui/characterEditor.py index 0f19b63c0..f7931acbc 100644 --- a/gui/characterEditor.py +++ b/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() diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 94c238810..79bfee344 100644 --- a/gui/mainFrame.py +++ b/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) diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index 84878bd16..5639e6921 100644 --- a/gui/marketBrowser.py +++ b/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)