r12899 - /1.3/gui/settings.py -- June 08, 2011 - 14:49

Author: semor
Date: Wed Jun  8 14:49:50 2011
New Revision: 12899

URL: http://svn.gna.org/viewcvs/relax?rev=12899&view=rev
Log:

relax icon is not shown in "Global relax settings" window if running on a Mac.

This is as in revision 12856:
    http://svn.gna.org/viewcvs/relax?rev=12856&view=rev),
but for the button "Settings" / "Global relax settings".

This change creates a bug, as the opened window upon clicking this button,
when closed, will have relax gui crash (with no button responding). This 
needs to be fixed...


Modified:
    1.3/gui/settings.py

Modified: 1.3/gui/settings.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/settings.py?rev=12899&r1=12898&r2=12899&view=diff
==============================================================================
--- 1.3/gui/settings.py (original)
+++ 1.3/gui/settings.py Wed Jun  8 14:49:50 2011
@@ -310,9 +310,13 @@
     def __set_properties(self):
         # begin globalparam.__set_properties
         self.SetTitle("Global parameters")
-        _icon = wx.EmptyIcon()
-        _icon.CopyFromBitmap(wx.Bitmap(paths.IMAGE_PATH+'relax_start.gif', 
wx.BITMAP_TYPE_ANY))
-        self.SetIcon(_icon)
+
+        # Disable icon if running on a Mac
+        if not 'darwin' in sys.platform:
+            _icon = wx.EmptyIcon()
+            
_icon.CopyFromBitmap(wx.Bitmap(paths.IMAGE_PATH+'relax_start.gif', 
wx.BITMAP_TYPE_ANY))
+            self.SetIcon(_icon)
+
         self.label_1_copy.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, 
wx.BOLD, 0, ""))
         self.bond.SetMinSize((250, 27))
         self.csa.SetMinSize((250, 27))