Merge branch 'master' of evefit.org:pyfa

2010-10-31 10:57:40 +01:00
parent a0d20614fb 379c5b61ba
commit 388803b3c4
3 changed files with 4 additions and 2 deletions
--- a/gui/builtinStatsViews/init.py
+++ b/gui/builtinStatsViews/init.py
@@ -1,3 +1,3 @@
 __all__ = ["resourcesViewFull", "resistancesViewFull",
           "rechargeViewFull", "firepowerViewFull", "capacitorViewFull",
-           "targetingmiscViewFull", "priceViewFull"]
+           "targetingMiscViewFull", "priceViewFull"]
--- a/gui/builtinStatsViews/targetingMiscViewFull.py
+++ b/gui/builtinStatsViews/targetingMiscViewFull.py
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -58,7 +58,9 @@ class MainFrame(wx.Frame):
    def __init__(self):
        wx.Frame.__init__(self, None, wx.ID_ANY, title="pyfa - Python Fitting Assistant")
        MainFrame.__instance = self
-        self.SetBackgroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_BTNFACE ) )
+
+        if 'wxMSW' in wx.PlatformInfo:
+            self.SetBackgroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_BTNFACE ) )

        i = wx.IconFromBitmap(bitmapLoader.getBitmap("pyfa", "icons"))
        self.SetIcon(i)