Changeset af7ba61 in sasview

Timestamp:

Jun 11, 2011 9:23:14 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:

228a8bb

Parents:

18e430a

Message:

check the wx version on MAC

File:

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

guiframe/data_panel.py

@@ -13 +13 @@
 import os
 import wx
+# Check version
+toks = wx.__version__.split('.')
+if int(toks[1]) < 9:
+    wx_version = 8
+else:
+    wx_version = 9
 import sys
 import warnings
@@ -76 +82 @@
     def __init__(self, parent,*args, **kwds):
         #agwstyle is introduced in wx.2.8.11 but is not working for mac
-        if IS_MAC:
+        if IS_MAC and wx_version < 9:
             try:
                 kwds['style'] = STYLE_FLAG
                 CT.CustomTreeCtrl.__init__(self, parent, *args, **kwds)
             except:
-                kwds['style'] = wx.RAISED_BORDER|wx.TR_HAS_BUTTONS|wx.TR_HIDE_ROOT|\
-                    wx.WANTS_CHARS|wx.TR_HAS_VARIABLE_ROW_HEIGHT
+                del kwds['style']
                 CT.CustomTreeCtrl.__init__(self, parent, *args, **kwds)
         else: