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

Timestamp:

Oct 11, 2018 2: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/sasview.py (modified) (2 diffs)

src/sas/sasview/sasview.py

@@ -42 +42 @@
 
         from sas.sasgui.guiframe.gui_manager import SasViewApp
+        from sas.sasgui.guiframe.gui_style import GUIFRAME_ICON
         self.gui = SasViewApp(0)
+        GUIFRAME_ICON.load_icons()
         if sys.platform == "darwin":
             self.check_sasmodels_compiler()
@@ -228 +230 @@
         logger.error("Wx version: error reading version")
 
-    from . import wxcruft
-    wxcruft.call_later_fix()
+    # TODO: Do we need the call later fix for wx 3? Or is it wx < 3 only?
+    if "phoenix" in wx.PlatformInfo:
+        #wx.NewId = wx.Window.NewControlId
+        pass
+    else:
+        from . import wxcruft
+        wxcruft.call_later_fix()
     #wxcruft.trace_new_id()
     #Always use private .matplotlib setup to avoid conflicts with other