Ignore:
Timestamp:
Mar 30, 2021 5:45:34 PM (10 months ago)
Author:
toby
Message:

fix back print issue + some CIF fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIctrlGUI.py

    r4852 r4868  
    183183    pass
    184184
     185if 'phoenix' in wx.version():
     186    wxValidator = wx.Validator
     187else:
     188    wxValidator = wx.pyValidator
     189
    185190#### Fixed definitions for wx Ids ################################################################################
    186191def Define_wxId(*args):
     
    542547        val = loc[key]
    543548        if 'style' in kw: # add a "Process Enter" to style
    544             kw['style'] += kw['style'] | wx.TE_PROCESS_ENTER
     549            kw['style'] |= wx.TE_PROCESS_ENTER
    545550        else:
    546551            kw['style'] = wx.TE_PROCESS_ENTER
     
    646651                s = ''
    647652                for c in val:
    648                     if ord(c) < 128: s += c
     653                    if ord(c) < 128:
     654                        s += c
     655                    else:
     656                        s += '!'
    649657                if val != s:
    650658                    val = s
     
    715723            self.OKcontrol(True)
    716724        # always store the result
    717         if self.CIFinput: # for CIF make results ASCII
     725        if self.CIFinput and '2' in platform.python_version_tuple()[0]: # CIF/Py2 make results ASCII
    718726            self.result[self.key] = val.encode('ascii','replace')
    719727        else:
     
    730738        val = self.GetValue().strip()
    731739        # always store the result
    732         if self.CIFinput: # for CIF make results ASCII
     740        if self.CIFinput and '2' in platform.python_version_tuple()[0]: # Py2/CIF make results ASCII
    733741            self.result[self.key] = val.encode('ascii','replace')
    734742        else:
     
    777785                pass
    778786################################################################################
    779 class NumberValidator(wx.PyValidator):
     787class NumberValidator(wxValidator):
    780788    '''A validator to be used with a TextCtrl to prevent
    781789    entering characters other than digits, signs, and for float
     
    816824        result=None, key=None, OKcontrol=None, CIFinput=False):
    817825        'Create the validator'
    818         if 'phoenix' in wx.version():
    819             wx.Validator.__init__(self)
    820         else:
    821             wx.PyValidator.__init__(self)
     826        wxValidator.__init__(self)
    822827        # save passed parameters
    823828        self.typ = typ
     
    978983
    979984################################################################################
    980 class ASCIIValidator(wx.PyValidator):
     985class ASCIIValidator(wxValidator):
    981986    '''A validator to be used with a TextCtrl to prevent
    982987    entering characters other than ASCII characters.
     
    994999        'Create the validator'
    9951000        import string
    996         wx.PyValidator.__init__(self)
     1001        wxValidator.__init__(self)
    9971002        # save passed parameters
    9981003        self.result = result
     
    10201025          is associated with.
    10211026        '''
    1022         self.result[self.key] = tc.GetValue().encode('ascii','replace')
     1027        if '2' in platform.python_version_tuple()[0]:
     1028            self.result[self.key] = tc.GetValue().encode('ascii','replace')
     1029        else:
     1030            self.result[self.key] = tc.GetValue()
    10231031        log.LogVarChange(self.result,self.key)
    10241032
Note: See TracChangeset for help on using the changeset viewer.