r12856 - /1.3/gui/relax_gui.py -- June 07, 2011 - 01:12

Author: michaelbieri
Date: Tue Jun  7 01:12:19 2011
New Revision: 12856

URL: http://svn.gna.org/viewcvs/relax?rev=12856&view=rev
Log:
relax icon is not shown in window title if running on a Mac.

Modified:
    1.3/gui/relax_gui.py

Modified: 1.3/gui/relax_gui.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/relax_gui.py?rev=12856&r1=12855&r2=12856&view=diff
==============================================================================
--- 1.3/gui/relax_gui.py (original)
+++ 1.3/gui/relax_gui.py Tue Jun  7 01:12:19 2011
@@ -153,12 +153,16 @@
     def __set_properties(self):
         # begin wxGlade: main.__set_properties
         self.SetTitle("relaxGUI " + GUI_version)
-        _icon = wx.EmptyIcon()
-        _icon.CopyFromBitmap(wx.Bitmap(paths.IMAGE_PATH+'relax.gif', 
wx.BITMAP_TYPE_ANY))
-        self.SetIcon(_icon)
-        self.SetSize((1000, 600))
+
+        # Disable icon if running on a Mac
+        if not 'darwin' in sys.platform:
+            _icon = wx.EmptyIcon()
+            _icon.CopyFromBitmap(wx.Bitmap(paths.IMAGE_PATH+'relax.gif', 
wx.BITMAP_TYPE_ANY))
+            self.SetIcon(_icon)
+            self.SetSize((1000, 600))
+
+        # statusbar fields
         self.frame_1_statusbar.SetStatusWidths([800, 50, -1])
-        # statusbar fields
         frame_1_statusbar_fields = ["relaxGUI (C) by Michael Bieri 2009", 
"relax:", version]
         for i in range(len(frame_1_statusbar_fields)):
             
self.frame_1_statusbar.SetStatusText(frame_1_statusbar_fields[i], i)