Changeset 2656 for trunk/GSASIIgrid.py

Timestamp:

Jan 22, 2017 4:27:37 PM (5 years ago)

Author:

toby

Message:

Way cleaner approach to grid pointer; handles multiple grids in a frame, too.

File:

• trunk/GSASIIgrid.py (modified) (2 diffs)

trunk/GSASIIgrid.py

@@ -4428 +4428 @@
     if G2frame.dataFrame:
         # save or finish processing of outstanding events
-        if G2frame.dataFrame.currentGrid:  # complete any open wx.Grid edits
-            if G2frame.dataFrame.currentGrid.IsCellEditControlEnabled(): # complete any grid edits in progress
-                if GSASIIpath.GetConfigValue('debug'): print 'Completing grid edit in',G2frame.dataFrame.currentGrid
-                G2frame.dataFrame.currentGrid.HideCellEditControl()
-                G2frame.dataFrame.currentGrid.DisableCellEditControl()
+        for grid in G2frame.dataFrame.currentGrids:  # complete any open wx.Grid edits
+            if grid.IsCellEditControlEnabled(): # complete any grid edits in progress
+                if GSASIIpath.GetConfigValue('debug'): print 'Completing grid edit in',grid
+                grid.HideCellEditControl()
+                grid.DisableCellEditControl()
         if G2frame.dataFrame.GetLabel() == 'Comments': # save any recently entered comments 
             try:
@@ -4461 +4461 @@
     SetDataMenuBar(G2frame)
     G2frame.dataFrame.Raise()            
-    G2frame.dataFrame.currentGrid = None # this will be a pointer to a grid placed in the frame
+    G2frame.dataFrame.currentGrids = [] # this will contain pointers to a grid placed in the frame
     G2frame.PickId = item
     G2frame.PickIdText = None