Remove superfluous alignment flags that became errors in wxpython 4.1 (…

…#601)
cctbx · Apr 5, 2021 · 79108f4 · 79108f4
1 parent e35b936
commit 79108f4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/xfel/ui/components/xfel_gui_dialogs.py b/xfel/ui/components/xfel_gui_dialogs.py
@@ -338,7 +338,7 @@ def __init__(self, parent, params,
     # Dialog control
     dialog_box = self.CreateSeparatedButtonSizer(wx.OK | wx.CANCEL)
     self.main_sizer.Add(dialog_box,
-                        flag=wx.EXPAND | wx.ALIGN_RIGHT | wx.ALL,
+                        flag=wx.EXPAND | wx.ALL,
                         border=10)
 
     self.Bind(wx.EVT_CHECKBOX, self.onDropTables, self.chk_drop_tables)
@@ -396,7 +396,7 @@ def __init__(self, parent, params,
     # Dialog control
     dialog_box = self.CreateSeparatedButtonSizer(wx.OK | wx.CANCEL)
     self.main_sizer.Add(dialog_box,
-                        flag=wx.EXPAND | wx.ALIGN_RIGHT | wx.ALL,
+                        flag=wx.EXPAND | wx.ALL,
                         border=10)
 
     self.SetTitle('LCLS Settings')
@@ -511,7 +511,7 @@ def __init__(self, parent, params,
     # Dialog control
     dialog_box = self.CreateSeparatedButtonSizer(wx.OK | wx.CANCEL)
     self.main_sizer.Add(dialog_box,
-                        flag=wx.EXPAND | wx.ALIGN_RIGHT | wx.ALL,
+                        flag=wx.EXPAND | wx.ALL,
                         border=10)
 
     self.Bind(wx.EVT_BUTTON, self.onOK, id=wx.ID_OK)
@@ -810,7 +810,7 @@ def __init__(self, parent, params,
     # Dialog control
     dialog_box = self.CreateSeparatedButtonSizer(wx.OK | wx.CANCEL)
     self.main_sizer.Add(dialog_box,
-                        flag=wx.EXPAND | wx.ALIGN_RIGHT | wx.ALL,
+                        flag=wx.EXPAND | wx.ALL,
                         border=10)
 
     self.SetTitle('Advanced Settings')
@@ -1061,7 +1061,7 @@ def __init__(self, parent,
     # Dialog control
     dialog_box = self.CreateSeparatedButtonSizer(wx.OK | wx.CANCEL)
     self.main_sizer.Add(dialog_box,
-                        flag=wx.EXPAND | wx.ALIGN_RIGHT | wx.ALL,
+                        flag=wx.EXPAND | wx.ALL,
                         border=10)
     # Bindings
     self.Bind(wx.EVT_CHOICE, self.onTrialChoice,
@@ -1216,7 +1216,7 @@ def __init__(self, parent, run, params,
     # Dialog control
     dialog_box = self.CreateSeparatedButtonSizer(wx.OK | wx.CANCEL)
     self.main_sizer.Add(dialog_box,
-                        flag=wx.EXPAND | wx.ALIGN_RIGHT | wx.ALL,
+                        flag=wx.EXPAND | wx.ALL,
                         border=10)
     self.Bind(wx.EVT_BUTTON, self.onOK, id=wx.ID_OK)
 
@@ -1265,7 +1265,7 @@ def __init__(self, parent,
     # Dialog control
     dialog_box = self.CreateSeparatedButtonSizer(wx.OK | wx.CANCEL)
     self.main_sizer.Add(dialog_box,
-                        flag=wx.EXPAND | wx.ALIGN_RIGHT | wx.ALL,
+                        flag=wx.EXPAND | wx.ALL,
                         border=10)
 
     self.SetTitle('Pick a trial and optionally some tags from that trial')
@@ -1395,7 +1395,7 @@ def __init__(self, parent,
     # Dialog control
     dialog_box = self.CreateSeparatedButtonSizer(wx.OK | wx.CANCEL)
     self.main_sizer.Add(dialog_box,
-                        flag=wx.EXPAND | wx.ALIGN_RIGHT | wx.ALL,
+                        flag=wx.EXPAND | wx.ALL,
                         border=10)
 
     self.Layout()
@@ -1533,7 +1533,7 @@ def __init__(self, parent,
     # Dialog control
     dialog_box = self.CreateSeparatedButtonSizer(wx.OK | wx.CANCEL)
     self.main_sizer.Add(dialog_box,
-                   flag=wx.EXPAND | wx.ALIGN_RIGHT | wx.ALL,
+                   flag=wx.EXPAND | wx.ALL,
                    border=10)
 
     self.Layout()
@@ -1914,7 +1914,7 @@ def __getattr__(self, item):
     # Dialog control
     dialog_box = self.CreateSeparatedButtonSizer(wx.OK | wx.CANCEL)
     self.main_sizer.Add(dialog_box,
-                        flag=wx.EXPAND | wx.ALIGN_RIGHT | wx.ALL,
+                        flag=wx.EXPAND | wx.ALL,
                         border=10)
 
     self.Bind(wx.EVT_RADIOBUTTON, self.onAutoEnd, self.end_type.auto)
@@ -2241,7 +2241,7 @@ def __init__(self, parent, trial,
     # Dialog control
     dialog_box = self.CreateSeparatedButtonSizer(wx.OK | wx.CANCEL)
     self.main_sizer.Add(dialog_box,
-                   flag=wx.EXPAND | wx.ALIGN_RIGHT | wx.ALL,
+                   flag=wx.EXPAND | wx.ALL,
                    border=10)
 
     self.Layout()
@@ -2380,7 +2380,7 @@ def __init__(self, parent, db,
     else:
       dialog_box = self.CreateSeparatedButtonSizer(wx.OK)
     self.main_sizer.Add(dialog_box,
-                        flag=wx.EXPAND | wx.ALIGN_RIGHT | wx.ALL,
+                        flag=wx.EXPAND | wx.ALL,
                         border=10)
 
     self.Layout()
@@ -2584,7 +2584,7 @@ def __init__(self, parent, db,
     # Dialog control
     dialog_box = self.CreateSeparatedButtonSizer(wx.OK | wx.CANCEL)
     self.main_sizer.Add(dialog_box,
-                        flag=wx.EXPAND | wx.ALIGN_RIGHT | wx.ALL,
+                        flag=wx.EXPAND | wx.ALL,
                         border=10)
 
     self.Layout()
@@ -2690,7 +2690,7 @@ def __init__(self, parent, db,
     # Dialog control
     dialog_box = self.CreateSeparatedButtonSizer(wx.OK | wx.CANCEL)
     self.main_sizer.Add(dialog_box,
-                        flag=wx.EXPAND | wx.ALIGN_RIGHT | wx.ALL,
+                        flag=wx.EXPAND | wx.ALL,
                         border=10)
 
     self.Layout()
@@ -2820,7 +2820,7 @@ def __init__(self, parent, dataset,
     # Dialog control
     dialog_box = self.CreateSeparatedButtonSizer(wx.OK | wx.CANCEL)
     self.main_sizer.Add(dialog_box,
-                   flag=wx.EXPAND | wx.ALIGN_RIGHT | wx.ALL,
+                   flag=wx.EXPAND | wx.ALL,
                    border=10)
 
     self.Layout()

diff --git a/xfel/ui/components/xfel_gui_init.py b/xfel/ui/components/xfel_gui_init.py
@@ -1437,13 +1437,13 @@ def __init__(self, parent, main):
 
     self.button_sizer = wx.BoxSizer(wx.HORIZONTAL)
     self.button_sizer.Add(self.btn_multirun_tags,
-                          flag=wx.RIGHT | wx.LEFT | wx.BOTTOM | wx.ALIGN_RIGHT,
+                          flag=wx.RIGHT | wx.LEFT | wx.BOTTOM,
                           border=10)
     self.button_sizer.Add(self.btn_persistent_tags,
-                          flag=wx.RIGHT | wx.LEFT | wx.BOTTOM | wx.ALIGN_RIGHT,
+                          flag=wx.RIGHT | wx.LEFT | wx.BOTTOM,
                           border=10)
     self.button_sizer.Add(self.btn_manage_tags,
-                          flag=wx.RIGHT | wx.LEFT | wx.BOTTOM | wx.ALIGN_RIGHT,
+                          flag=wx.RIGHT | wx.LEFT | wx.BOTTOM,
                           border=10)
     self.main_sizer.Add(self.button_sizer, flag=wx.EXPAND | wx.ALL, border=10)
 
@@ -3258,7 +3258,7 @@ def __init__(self, parent, db, trial, box_label=None):
                        border=10)
 
     self.main_sizer.Add(self.block_panel, 1, flag=wx.EXPAND | wx.ALL, border=10)
-    self.main_sizer.Add(self.add_panel, flag=wx.ALL | wx.ALIGN_BOTTOM, border=5)
+    self.main_sizer.Add(self.add_panel, flag=wx.ALL, border=5)
 
     # Bindings
     self.Bind(wx.EVT_BUTTON, self.onAddBlock, self.btn_add_block)
@@ -3371,7 +3371,7 @@ def __init__(self, parent, db, dataset, box_label=""):
 
     self.main_sizer.Add(self.dataset_comment, 0, flag=wx.ALL, border=10)
     self.main_sizer.Add(self.task_panel, 1, flag=wx.EXPAND | wx.ALL, border=10)
-    self.main_sizer.Add(self.add_panel, flag=wx.ALL | wx.ALIGN_BOTTOM, border=5)
+    self.main_sizer.Add(self.add_panel, flag=wx.ALL, border=5)
 
     # Bindings
     self.Bind(wx.EVT_BUTTON, self.onAddTask, self.btn_add_task)