Changeset 1972

Timestamp:

Sep 16, 2015 5:35:18 PM (6 years ago)

Author:

toby

Message:

Element selection workaround for wx>2.8 on mac

File:

• trunk/GSASIIElemGUI.py (modified) (3 diffs)

trunk/GSASIIElemGUI.py

@@ -43 +43 @@
             else:
                 color=E[6]
-            PickElement.ElButton(self,name=E[0],
-               pos=wx.Point(E[1]*self.butWid+25,E[2]*24+24),tip=E[3],color=color)
+            self.ElButton(name=E[0],
+               pos=wx.Point(E[1]*self.butWid+25,E[2]*24+24),
+               tip=E[3],color=color)
             i+=1
 
@@ -54 +55 @@
         
     def ElButton(self, name, pos, tip, color):
-        'Needs a doc string'
+        'Creates an element button widget'
         Black = wx.Colour(0,0,0)
         if not self.ifNone and name[0] == 'None':
@@ -66 +67 @@
             if name[0] == 'None':
                 butWid *= 2
-            El = wx.ComboBox(choices=name, parent=self, pos=pos, size=wx.Size(butWid,23),
-                style=wx.CB_READONLY, value=name[0])
+            # patch for wx 2.9+ on Mac where EVT_COMBOBOX happens only on
+            # value change. Not ideal because wx.CB_READONLY is better.
+            i,j= wx.__version__.split('.')[0:2]
+            if int(i)+int(j)/10. > 2.8 and 'wxOSX' in wx.PlatformInfo:
+
+                El = wx.ComboBox(choices=name, parent=self, pos=pos, size=wx.Size(butWid,23),
+                    style=wx.CB_DROPDOWN, value=name[0]+' ') # add an invisible space
+            else:
+                El = wx.ComboBox(choices=name, parent=self, pos=pos, size=wx.Size(butWid,23),
+                    style=wx.CB_READONLY, value=name[0]) 
             El.Bind(wx.EVT_COMBOBOX,self.OnElButton)