Fix wx_compat code for wxPython >= 4.0.0b2

RobinD42 · RobinD42 · commit a83a102f442b · 2017-09-14T12:00:10.000-07:00
diff --git a/lib/matplotlib/backends/wx_compat.py b/lib/matplotlib/backends/wx_compat.py
@@ -145,12 +145,23 @@ def _AddTool(parent, wx_ids, text, bmp, tooltip_text):
             kind = wx.ITEM_CHECK
         else:
             kind = wx.ITEM_NORMAL
-        parent.AddTool(wx_ids[text], label=text,
-                       bitmap=bmp,
-                       bmpDisabled=wx.NullBitmap,
-                       shortHelpString=text,
-                       longHelpString=tooltip_text,
-                       kind=kind)
+
+        if LooseVersion(wx.VERSION_STRING) >= LooseVersion("4.0.0b2"):
+            kwargs = dict(label=text,
+                          bitmap=bmp,
+                          bmpDisabled=wx.NullBitmap,
+                          shortHelp=text,
+                          longHelp=tooltip_text,
+                          kind=kind)
+        else:
+            kwargs = dict(label=text,
+                          bitmap=bmp,
+                          bmpDisabled=wx.NullBitmap,
+                          shortHelpString=text,
+                          longHelpString=tooltip_text,
+                          kind=kind)
+
+        parent.AddTool(wx_ids[text], **kwargs)
     else:
         if text in ['Pan', 'Zoom']:
             parent.AddCheckTool(
