Changeset 1378 for trunk/GSASII.py


Ignore:
Timestamp:
Jun 11, 2014 3:38:24 PM (8 years ago)
Author:
toby
Message:

wxPython 2.9 fixes: FlexGridSizer?, wx.Colour, MacOpenFile?; move bind to prevent Rigid body crash

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1368 r1378  
    21782178            mainSizer.Add((10,10),1)
    21792179            ncols = len(data)/40+1
    2180             dataGridSizer = wx.FlexGridSizer(rows=len(data),cols=ncols,hgap=2,vgap=2)
     2180            dataGridSizer = wx.FlexGridSizer(cols=ncols,hgap=2,vgap=2)
    21812181            for id,item in enumerate(self.data):
    21822182                ckbox = wx.CheckBox(panel,id,item[1])
     
    22292229            mainSizer.Add(topLabl,0,wx.ALIGN_CENTER_VERTICAL|wx.LEFT,10)
    22302230            mainSizer.Add((10,10),1)
    2231             dataGridSizer = wx.FlexGridSizer(rows=len(data),cols=2,hgap=2,vgap=2)
     2231            dataGridSizer = wx.FlexGridSizer(cols=2,hgap=2,vgap=2)
    22322232            for id,item in enumerate(self.data[:-1]):
    22332233                name = wx.TextCtrl(panel,-1,item[1],size=wx.Size(200,20))
     
    33623362        # end DEBUG
    33633363        return True
    3364     def MacOpenFile(self, filename):
    3365         '''Called on Mac every time a file is dropped on the app when it is running,
    3366         treat this like a File/Open project menu action.
    3367         Should be ignored on other platforms
    3368         '''
    3369         # PATCH: Canopy 1.4 script main seems dropped on app; ignore .py files
    3370         if os.path.splitext(filename)[1] == '.py': return
    3371         # end PATCH
    3372         self.main.OnFileOpen(None,filename)
    3373 
     3364    # def MacOpenFile(self, filename):
     3365    #     '''Called on Mac every time a file is dropped on the app when it is running,
     3366    #     treat this like a File/Open project menu action.
     3367    #     Should be ignored on other platforms
     3368    #     '''
     3369    #     # PATCH: Canopy 1.4 script main seems dropped on app; ignore .py files
     3370    #     print 'MacOpen',filename
     3371    #     if os.path.splitext(filename)[1] == '.py': return
     3372    #     # end PATCH
     3373    #     self.main.OnFileOpen(None,filename)
     3374    # removed because this gets triggered when a file is on the command line in canopy 1.4 -- not likely used anyway
     3375   
    33743376def main():
    33753377    '''Start up the GSAS-II application'''
Note: See TracChangeset for help on using the changeset viewer.