Changeset 228a8bb in sasview

Timestamp:

Jun 11, 2011 11:47:41 AM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

8bb0660

Parents:

af7ba61

Message:

more accurate version checking

File:

• guiframe/data_panel.py (modified) (2 diffs)

guiframe/data_panel.py

@@ -16 +16 @@
 toks = wx.__version__.split('.')
 if int(toks[1]) < 9:
-    wx_version = 8
+    if int(toks[2]) < 12:
+        wx_version = 811
+    else:
+        wx_version = 812
 else:
-    wx_version = 9
+    wx_version = 900
 import sys
 import warnings
@@ -82 +85 @@
     def __init__(self, parent,*args, **kwds):
         #agwstyle is introduced in wx.2.8.11 but is not working for mac
-        if IS_MAC and wx_version < 9:
+        if IS_MAC and wx_version < 812:
             try:
                 kwds['style'] = STYLE_FLAG