Changeset 3445

Timestamp:

Jun 21, 2018 9:44:35 AM (5 years ago)

Author:

vondreele

Message:

wx phoenix fixes to G2ctrls for tooltip & sequential table motion binds to show tooltips for esds, etc.
replace SelectItem? with SelectDataTreeItem? for seq table after seqrefine finished. Works now.

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (2 diffs)
• GSASIIdataGUI.py (modified) (1 diff)

trunk/GSASIIctrlGUI.py

@@ -1370 +1370 @@
                     style=wx.RAISED_BORDER)
                 but.Bind(wx.EVT_BUTTON, self._OnCopyButton)
-                but.SetToolTipString('Press to copy adjacent value to all rows below')
+                if 'phoenix' in wx.version():
+                    but.SetToolTip('Press to copy adjacent value to all rows below')
+                else:
+                    but.SetToolTipString('Press to copy adjacent value to all rows below')
                 self.ButtonIndex[but] = i
                 subSizer.Add(but)
@@ -3690 +3693 @@
                 return
             if hinttext is None: hinttext = ''
-            win.SetToolTipString(hinttext)
+            if 'phoenix' in wx.version():
+                win.SetToolTip(hinttext)
+            else:
+                win.SetToolTipString(hinttext)
             prev_rowcol[:] = [row,col,win]
             if event: event.Skip()
-
-        wx.EVT_MOTION(self.GetGridWindow(), OnMouseMotion)
-        if colLblCallback: wx.EVT_MOTION(self.GetGridColLabelWindow(), OnMouseMotion)
-        if rowLblCallback: wx.EVT_MOTION(self.GetGridRowLabelWindow(), OnMouseMotion)
+        if 'phoenix' in wx.version():
+            self.GetGridWindow().Bind(wx.EVT_MOTION,OnMouseMotion)
+            if colLblCallback: self.GetGridColLabelWindow().Bind(wx.EVT_MOTION,OnMouseMotion)
+            if rowLblCallback: self.GetGridRowLabelWindow().Bind(wx.EVT_MOTION,OnMouseMotion)
+        else:
+            wx.EVT_MOTION(self.GetGridWindow(), OnMouseMotion)
+            if colLblCallback: wx.EVT_MOTION(self.GetGridColLabelWindow(), OnMouseMotion)
+            if rowLblCallback: wx.EVT_MOTION(self.GetGridRowLabelWindow(), OnMouseMotion)
                                                     
 ################################################################################           

trunk/GSASIIdataGUI.py

@@ -4482 +4482 @@
                     self.ResetPlots()
                     sId = GetGPXtreeItemId(self,self.root,'Sequential results')
-                    self.GPXtree.SelectItem(sId)
+                    SelectDataTreeItem(self,sId)
             finally:
                 dlg.Destroy()