Changeset 1526
- Timestamp:
- Oct 15, 2014 5:00:42 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIlog.py
r1521 r1526 411 411 return 412 412 menu = parentmenu 413 413 414 i,j= wx.__version__.split('.')[0:2] 415 if int(i)+int(j)/10. > 2.8 and 'wxOSX' in wx.PlatformInfo: 416 # on mac, with wx 2.9+ the menubar has a menu and this is found above, so 417 # we are now done. 418 return menuLabelList,menuitem 419 414 420 menubar = menu.MenuBar 415 421 for i in range(menubar.GetMenuCount()): 416 422 if menubar.GetMenu(i) == menu: 417 423 menuLabelList += [menubar.GetMenuLabel(i)] 418 break 419 else: 420 # menu not found in menubar, something is wrong 421 print 'error tracing menuitem to menubar',menuLabelList 422 #raise Exception('debug2: error tracing menuitem') 423 return 424 return menuLabelList,menuitem 424 return menuLabelList,menuitem 425 426 # menu not found in menubar, something is wrong 427 print 'error tracing menuitem to menubar',menuLabelList 428 #raise Exception('debug2: error tracing menuitem') 429 return 425 430 426 431 def SaveMenuCommand(id,G2frame,handler): -
trunk/sphinxdocs/source/index.rst
r1298 r1526 32 32 * NumPy (http://docs.scipy.org/doc/numpy/reference/), 33 33 * SciPy (http://docs.scipy.org/doc/scipy/reference/), 34 * matplotlib (http://matplotlib.org/contents.html) and 34 * matplotlib (http://matplotlib.org/contents.html) 35 * PIL or Pillow (https://pillow.readthedocs.org) and 35 36 * PyOpenGL (http://pyopengl.sourceforge.net/documentation) 36 37 … … 38 39 as part of the Python standard library and must be obtained separately 39 40 (or in a bundled Python package such as the Enthought Python 40 Distribution/Canopy ).41 Distribution/Canopy or anaconda). 41 42 The PyOpenGL package is installed into Python by GSAS-II if not found, 42 43 so it does not need to be included in the Python bundle.
Note: See TracChangeset
for help on using the changeset viewer.