Changeset 31d5afa in sasview

Timestamp:

Sep 19, 2011 11:40:29 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:

a48ecbd

Parents:

ea4ed10

Message:

fixed wx version checking

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (2 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -159 +159 @@
 APPLICATION_WLIST = config.APPLICATION_WLIST
 IS_WIN = True
+CLOSE_SHOW = True
 if sys.platform.count("win32")==0:
     IS_WIN = False
-
+    if int(wx.__version__.split('.')[0]) == 2:
+        if int(wx.__version__.split('.')[1]) < 9:
+            CLOSE_SHOW = False
     
 class ViewerFrame(wx.Frame):
@@ -836 +839 @@
                               Left().
                               MinimizeButton().
-                              CloseButton(True).
+                              CloseButton(CLOSE_SHOW).
                               TopDockable(False).
                               BottomDockable(False).