Changeset 1526

Timestamp:

Oct 15, 2014 5:00:42 PM (8 years ago)

Author:

toby

Message:

address menu trace problem with wx 2.9+

Location:

trunk

Files:

• GSASIIlog.py (modified) (1 diff)
• sphinxdocs/source/index.rst (modified) (2 diffs)

trunk/GSASIIlog.py

@@ -411 +411 @@
             return
         menu = parentmenu
-
+        
+    i,j= wx.__version__.split('.')[0:2]
+    if int(i)+int(j)/10. > 2.8 and 'wxOSX' in wx.PlatformInfo:
+        # on mac, with wx 2.9+ the menubar has a menu and this is found above, so
+        # we are now done.
+        return menuLabelList,menuitem
+    
     menubar = menu.MenuBar
     for i in range(menubar.GetMenuCount()):
         if menubar.GetMenu(i) == menu:
             menuLabelList += [menubar.GetMenuLabel(i)]
-            break
-    else:
-        # menu not found in menubar, something is wrong
-        print 'error tracing menuitem to menubar',menuLabelList
-        #raise Exception('debug2: error tracing menuitem')
-        return
-    return menuLabelList,menuitem
+            return menuLabelList,menuitem
+
+    # menu not found in menubar, something is wrong
+    print 'error tracing menuitem to menubar',menuLabelList
+    #raise Exception('debug2: error tracing menuitem')
+    return
 
 def SaveMenuCommand(id,G2frame,handler):

trunk/sphinxdocs/source/index.rst

@@ -32 +32 @@
 * NumPy (http://docs.scipy.org/doc/numpy/reference/), 
 * SciPy (http://docs.scipy.org/doc/scipy/reference/),
-* matplotlib (http://matplotlib.org/contents.html) and 
+* matplotlib (http://matplotlib.org/contents.html)  
+* PIL or Pillow (https://pillow.readthedocs.org) and 
 * PyOpenGL (http://pyopengl.sourceforge.net/documentation)
 
@@ -38 +39 @@
 as part of the Python standard library and must be obtained separately
 (or in a bundled Python package such as the Enthought Python
-Distribution/Canopy). 
+Distribution/Canopy or anaconda). 
 The PyOpenGL package is installed into Python by GSAS-II if not found,
 so it does not need to be included in the Python bundle.