Changeset 4991 for trunk/GSASIIpwdGUI.py

Timestamp:

Jul 7, 2021 10:33:07 AM (21 months ago)

Author:

toby

Message:

more wx4.1 fixes (PDF controls mostly)

File:

• trunk/GSASIIpwdGUI.py (modified) (5 diffs)

trunk/GSASIIpwdGUI.py

@@ -4558 +4558 @@
     littleSizer = wx.FlexGridSizer(0,min(6,useGUI[1]),5,5)
     for txt,fmt,ifEdit,Id in useGUI[2]:
-        littleSizer.Add(wx.StaticText(G2frame.dataWindow,label=txt,style=wx.ALIGN_RIGHT),0,WACV|wx.ALIGN_RIGHT)
+        littleSizer.Add(wx.StaticText(G2frame.dataWindow,label=txt,style=wx.ALIGN_RIGHT))
+        # above changed from 
+        # littleSizer.Add(wx.StaticText(G2frame.dataWindow,label=txt,style=wx.ALIGN_RIGHT),0,WACV|wx.ALIGN_RIGHT)
+        # which can't be valid, but not tested (BHT)
         if ifEdit:          #a,b,c,etc.
             cellVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,controls,6+Id,nDig=fmt,OnLeave=OnCellChange)
@@ -6156 +6159 @@
                 if parm in Parms:
                     if parm == 'MinSize':
-                        parmSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Dist '+parm),0,wx.ALIGN_CENTER)
+                        parmSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Dist '+parm,style=wx.ALIGN_CENTER))
                     else:
                         parmVar = wx.CheckBox(G2frame.dataWindow,label='Refine? Dist '+parm) 
@@ -7247 +7250 @@
         optB = wx.Button(G2frame.dataWindow,label='Optimize PDF',style=wx.BU_EXACTFIT)
         optB.Bind(wx.EVT_BUTTON, OnOptimizePDF)
-        sqBox.Add(optB,0,WACV|wx.ALIGN_RIGHT)
+        sqBox.Add(optB,0,WACV)
         sfgSizer.Add(sqBox,0,wx.EXPAND)
         
@@ -7273 +7276 @@
         sqBox.Add(flatSpin,0,WACV)
         sqBox.Add((1,1),1,wx.EXPAND,1)
-        sqBox.Add(wx.StaticText(G2frame.dataWindow,label='Rmin: '),0,WACV|wx.ALIGN_RIGHT)
+        sqBox.Add(wx.StaticText(G2frame.dataWindow,label='Rmin: '),0,WACV)
         rmin = G2G.ValidatedTxtCtrl(G2frame.dataWindow,data,'Rmin',nDig=(5,1),
                 typeHint=float,size=wx.Size(50,20))
-        sqBox.Add(rmin,0,WACV|wx.ALIGN_RIGHT)
+        sqBox.Add(rmin,0,WACV)
         sfgSizer.Add(sqBox,0,wx.EXPAND)
             
@@ -7636 +7639 @@
     if powId:
         ElList = data['ElList']
-        mainSizer.Add(PDFFileSizer(),0,WACV)
+        mainSizer.Add(PDFFileSizer())
         G2G.HorizontalLine(mainSizer,G2frame.dataWindow)
-        mainSizer.Add(SampleSizer(),0,WACV)
+        mainSizer.Add(SampleSizer())
         G2G.HorizontalLine(mainSizer,G2frame.dataWindow)
-        mainSizer.Add(SFGctrlSizer(),0,WACV)
+        mainSizer.Add(SFGctrlSizer())
         G2G.HorizontalLine(mainSizer,G2frame.dataWindow)
-        mainSizer.Add(DiffSizer(),0,WACV)
+        mainSizer.Add(DiffSizer())
     else:
         mainSizer.Add(wx.StaticText(G2frame.dataWindow,wx.ID_ANY,