Merge pull request #114 from bastula/windowsfixes

2dview: Fix issues with keyboard and mousewheel navigation on Windows.

dicompyler/baseplugins/2dview.py

@@ -589,13 +589,6 @@ def OnZoomOut(self, evt):
     def OnKeyDown(self, evt):
         """Change the image when the user presses the appropriate keys."""
 
-        # Needed to work around a bug in Windows. See main.py for more details.
-        if guiutil.IsMSWindows():
-            try:
-                evt = evt.data
-            except AttributeError:
-                keyname = evt.GetKeyCode()
-
         if len(self.images):
             keyname = evt.GetKeyCode()
             prevkey = [wx.WXK_UP, wx.WXK_PAGEUP]
@@ -624,14 +617,6 @@ def OnKeyDown(self, evt):
     def OnMouseWheel(self, evt):
         """Change the image when the user scrolls the mouse wheel."""
 
-        # Needed to work around a bug in Windows. See main.py for more details.
-        if guiutil.IsMSWindows():
-            try:
-                evt = evt.data
-            except AttributeError:
-                delta = evt.GetWheelDelta()
-                rot = evt.GetWheelRotation()
-
         if len(self.images):
             delta = evt.GetWheelDelta()
             rot = evt.GetWheelRotation()

dicompyler/main.py

@@ -833,15 +833,15 @@ def OnKeyDown(self, evt):
             notebook tab instead of the panel receives focus."""
 
         if guiutil.IsMSWindows():
-            pub.sendMessage('main.key_down', msg=evt)
+            pub.sendMessage('main.key_down', evt=evt)
 
     def OnMouseWheel(self, evt):
         """Capture the mousewheel event when the notebook tab is focused.
             Currently this is used to workaround a bug in Windows since the
             notebook tab instead of the panel receives focus."""
 
         if guiutil.IsMSWindows():
-            pub.sendMessage('main.mousewheel', msg=evt)
+            pub.sendMessage('main.mousewheel', evt=evt)
 
     def OnPreferences(self, evt):
         """Load and show the Preferences dialog box."""