Changeset 4811 for trunk/GSASIIctrlGUI.py

Timestamp:

Feb 12, 2021 10:59:21 AM (3 years ago)

Author:

toby

Message:

more wx4.1 & help button fixes; fix OnLeave? if called when a window is deleted; HessianLSQ fix

File:

• trunk/GSASIIctrlGUI.py (modified) (4 diffs)

trunk/GSASIIctrlGUI.py

@@ -777 +777 @@
         if self.OnLeave:
             self.event = event
-            self.OnLeave(invalid=self.invalid,value=self.result[self.key],
-                tc=self,**self.OnLeaveArgs)
-
+            try:
+                self.OnLeave(invalid=self.invalid,value=self.result[self.key],
+                    tc=self,**self.OnLeaveArgs)
+            except:
+                pass
 ################################################################################
 class NumberValidator(wx.PyValidator):
@@ -2714 +2716 @@
         else:
             self.valItem = wx.TextCtrl(self.panel,-1,value=self.value,size=size)
-        sizer1.Add(self.valItem,0,wx.ALIGN_CENTER)
         if help:
-            sizer1.Add(HelpButton(self.panel,help),0,wx.ALIGN_RIGHT|wx.ALL)
-        mainSizer.Add(sizer1,0,wx.ALIGN_CENTER)
+            sizer1.Add((-1,-1),1,wx.EXPAND)
+            sizer1.Add(self.valItem,0,wx.ALIGN_CENTER)
+            sizer1.Add((-1,-1),1,wx.EXPAND)
+            sizer1.Add(HelpButton(self.panel,help),0,wx.ALL)
+        else:
+            sizer1.Add(self.valItem,0,wx.ALIGN_CENTER)
+        mainSizer.Add(sizer1,0,wx.EXPAND)
         btnsizer = wx.StdDialogButtonSizer()
         OKbtn = wx.Button(self.panel, wx.ID_OK)
@@ -3576 +3582 @@
         mainSizer.Add((0,10))
         for line in text:
-            mainSizer.Add(wx.StaticText(self.panel,label='     %s     '%(line)),0,WACV)
+            mainSizer.Add(wx.StaticText(self.panel,label='     %s     '%(line)))
         ncol = self.table[0].count(',')+1
         tableSizer = wx.FlexGridSizer(0,2*ncol+3,0,0)
@@ -3583 +3589 @@
             if 'for' in item:
                 mainSizer.Add(tableSizer,0,wx.ALIGN_LEFT)
-                mainSizer.Add(wx.StaticText(self.panel,label=item),0,WACV)
+                mainSizer.Add(wx.StaticText(self.panel,label=item),0)
                 tableSizer = wx.FlexGridSizer(0,2*ncol+3,0,0)
                 continue