Changeset 846c724 in sasview

Timestamp:

Aug 23, 2011 10:46:31 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:

75ea4e8

Parents:

c0c9f68e

Message:

unlocked show plots for mac

Location:

sansguiframe/src/sans/guiframe

Files:

• gui_manager.py (modified) (2 diffs)
• local_perspectives/plotting/plotting.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -148 +148 @@
     PLUGINS_WLIST = ''
 APPLICATION_WLIST = config.APPLICATION_WLIST
-if sys.platform.count("darwin")==0:
-    IS_WIN = True
-else:
+IS_WIN = True
+if sys.platform.count("win32")==0:
     IS_WIN = False
+
     
 class ViewerFrame(wx.Frame):
@@ -689 +689 @@
                               Left().
                               MinimizeButton().
-                              CloseButton(IS_WIN).
+                              CloseButton(True).
                               TopDockable(False).
                               BottomDockable(False).

sansguiframe/src/sans/guiframe/local_perspectives/plotting/plotting.py

@@ -24 +24 @@
 DEFAULT_MENU_ITEM_ID = wx.NewId()
 
-if sys.platform.count("darwin")==0:
-    IS_WIN = True
-else:
-    IS_WIN = False
+IS_WIN = True    
+if sys.platform.count("win32")==0:
+    if wx.__version__.split('.')[0] == 2:
+        if wx.__version__.split('.')[1] < 9:
+            IS_WIN = False
+
 
 class Plugin(PluginBase):