Changeset 3314

Timestamp:

Mar 12, 2018 12:06:39 PM (4 years ago)

Author:

toby

Message:

Use standard names as options for mpl backend tools

File:

• trunk/GSASIIplot.py (modified) (1 diff)

trunk/GSASIIplot.py

@@ -145 +145 @@
 import matplotlib.colors as mpcls
 from matplotlib.backends.backend_wx import _load_bitmap
-from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as Canvas
-from matplotlib.backends.backend_wxagg import NavigationToolbar2Wx as Toolbar
-from matplotlib.backends.backend_agg import FigureCanvasAgg as hcCanvas
+try:
+    from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as Canvas
+except ImportError:
+    from matplotlib.backends.backend_wx import FigureCanvas as Canvas
+try:
+    from matplotlib.backends.backend_wxagg import NavigationToolbar2Wx as Toolbar
+except ImportError:
+    from matplotlib.backends.backend_wxagg import Toolbar as Toolbar # name changes in wx4.0.1
+try:
+    from matplotlib.backends.backend_agg import FigureCanvasAgg as hcCanvas
+except ImportError:
+    from matplotlib.backends.backend_agg import FigureCanvas as hcCanvas # standard name
 
 # useful degree trig functions