Changeset 1004 for trunk/GSASIIplot.py

Timestamp:

Jul 21, 2013 8:38:32 PM (10 years ago)

Author:

toby

Message:

recapture focus on plot window so keyboard commands work

File:

• trunk/GSASIIplot.py (modified) (4 diffs)

trunk/GSASIIplot.py

@@ -122 +122 @@
         self.status.SetStatusWidths([150,-1])
         self.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED, self.OnPageChanged)
+        self.nb.Bind(wx.EVT_KEY_UP,self.OnNotebookKey)
         
         self.plotList = []
             
+    def OnNotebookKey(self,event):
+        '''Called when a keystroke event gets picked up by the notebook window
+        rather the child. This is not expected, but somehow it does sometimes
+        on the Mac and perhaps Linux.
+
+        Assume that the page associated with the currently displayed tab
+        has a child, .canvas; give that child the focus and pass it the event.
+        '''
+        Page = self.nb.GetPage(self.nb.GetSelection())
+        try:
+            Page.canvas.SetFocus()
+            wx.PostEvent(Page.canvas,event)
+        except AttributeError:
+            pass
+
     def addMpl(self,name=""):
         'Add a tabbed page with a matplotlib plot'
@@ -1010 +1026 @@
             cb.SetValue(' key press')
             wx.CallAfter(OnPlotKeyPress,event)
+        try:
+            Page.canvas.SetFocus() # redirect the Focus from the button back to the plot
+        except:
+            pass
+
                         
     def OnMotion(event):
@@ -2127 +2148 @@
             if event.key in 'l':
                 wx.CallAfter(OnImPlotKeyPress,event)
+        try:
+            Page.canvas.SetFocus() # redirect the Focus from the button back to the plot
+        except:
+            pass
                         
     def OnImPick(event):
@@ -2725 +2750 @@
             cb.SetValue(' save as/key:')
             wx.CallAfter(OnKey,event)
+        try:
+            Page.canvas.SetFocus() # redirect the Focus from the button back to the plot
+        except:
+            pass
 
     def OnKey(event):           #on key UP!!