Changeset 5251ec6 in sasview for src/sas/sasview/welcome_panel.py

Timestamp:

Oct 11, 2018 12:20:56 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

98b9f32

Parents:

67ed543

Message:

improved support for py37 in sasgui

File:

• src/sas/sasview/welcome_panel.py (modified) (2 diffs)

src/sas/sasview/welcome_panel.py

@@ -2 +2 @@
     Welcome page
 """
-import wx
-import wx.aui
-import wx.lib.hyperlink
 import os.path
 import os, sys
 
+import wx
+import wx.aui
+try:
+    # CRUFT: wx 4 moved hyperlink to wx.lib.agw
+    from wx.lib import hyperlink
+except ImportError:
+    from wx.lib.agw import hyperlink
 from wx.lib.scrolledpanel import ScrolledPanel
 
@@ -115 +119 @@
         send_ticket += "help@sasview.org"
         self.hyperlink_paper = \
-            wx.lib.hyperlink.HyperLinkCtrl(self, -1,
+            hyperlink.HyperLinkCtrl(self, -1,
                                            send_ticket, URL=config._license)