Changeset 4794 for trunk


Ignore:
Timestamp:
Feb 3, 2021 10:45:21 AM (9 months ago)
Author:
toby
Message:

work on docs

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIctrlGUI.py

    r4785 r4794  
    135135    import wx.lib.scrolledpanel as wxscroll
    136136    import wx.html        # could postpone this for quicker startup
     137    import wx.lib.mixins.listctrl  as  listmix
    137138    import matplotlib as mpl
    138139except ImportError:
    139     raise
    140     # Dumm 'wx' so this file can be imported
     140    pass
     141    # Emulate 'wx' so this file can be imported
    141142    vals = ('TreeCtrl TextCtrl PyValidator Button ComboBox Choice CheckBox'.split() +
    142143            'Dialog ID_ANY OPEN'.split())
     
    149150                return object
    150151            return Placeholder([])
    151     wx = Placeholder(vals)
    152     wxscroll = Placeholder(['ScrolledPanel'])
    153     if 'phoenix' in wx.version():
    154         wg = Placeholder('Grid GridTableBase GridCellEditor'.split())
    155     else:
    156         wg = Placeholder('Grid PyGridTableBase PyGridCellEditor'.split())
     152    # wx = Placeholder(vals)
     153    # wxscroll = Placeholder(['ScrolledPanel'])
     154    # if 'phoenix' in wx.version():
     155    #     wg = Placeholder('Grid GridTableBase GridCellEditor'.split())
     156    # else:
     157    #     wg = Placeholder('Grid PyGridTableBase PyGridCellEditor'.split())
     158    # # avoid "duplicate base class _MockObject" error in class G2LstCtrl():
     159    # # where listmix.ListCtrlAutoWidthMixin, listmix.ColumnSorterMixin are same
     160    # # in docs build
     161    listmix = Placeholder()
     162    listmix.ListCtrlAutoWidthMixin = Placeholder()
     163    listmix.ColumnSorterMixin = Placeholder()
     164
     165       
    157166import time
    158167import glob
     
    59986007################################################################################
    59996008################################################################################
    6000 import wx.lib.mixins.listctrl  as  listmix
    60016009class SortableLstCtrl(wx.Panel):
    60026010    '''Creates a read-only table with sortable columns. Sorting is done by
  • trunk/GSASIIplot.py

    r4793 r4794  
    132132    from scipy.ndimage.interpolation import map_coordinates
    133133except (ImportError, ValueError):
    134     # avoid "duplicate base class _MockObject" error in class G2LstCtrl():
    135     # where listmix.ListCtrlAutoWidthMixin, listmix.ColumnSorterMixin are same
    136     # in docs build
    137     class Placeholder(object):
    138         def __init__(self):
    139             self.Dialog = object
    140     class Placeholder1(object): pass
    141     listmix = Placeholder()
    142     listmix.ListCtrlAutoWidthMixin = Placeholder()
    143     listmix.ColumnSorterMixin = Placeholder1()
     134    pass
    144135import GSASIIpath
    145136Clip_on = GSASIIpath.GetConfigValue('Clip_on',True)
Note: See TracChangeset for help on using the changeset viewer.