FLAGS for wxpython 4.2

diff --git a/dialog.py b/dialog.py
index 67c8a2b..93fd3e4 100755 (executable)
--- a/dialog.py
+++ b/dialog.py
@@ -919,7 +919,7 @@ class PrefExport(wx.Dialog):
         self.label_lem = wx.StaticText(self, -1, _("Lemmatised corpus"))
         box3.Add(self.label_lem, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT, 5)
         self.radio_lem = wx.RadioBox(self, -1, "", choices= [ _("yes"), _("no") ], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
-        box3.Add(self.radio_lem, 0, wx.ALIGN_RIGHT, 5)
+        box3.Add(self.radio_lem, 0, wx.EXPAND, 5)
         sizer.Add(box3, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
         self.label_txt = wx.StaticText(self, -1, _("Export for ..."))
         box.Add(self.label_txt, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
@@ -971,14 +971,14 @@ class PrefProfTypes(wx.Dialog):
         box.Add(self.label_txt, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
         self.radio_type = wx.RadioBox(self, -1, "", choices=[_("Like ALCESTE"), _("Like Lexico")], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
         box.Add(self.radio_type, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
-        sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
+        sizer.Add(box, 0, wx.GROW|wx.ALL, 5)
         box2 = wx.BoxSizer(wx.HORIZONTAL)
         self.txt2 = wx.StaticText(self, -1, _("Output file"))
         box2.Add(self.txt2, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
         self.fbb = filebrowse.FileBrowseButton(self, -1, size=(450, -1), fileMode = 2)
         box2.Add(self.fbb, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
         self.fbb.SetLabel("")
-        sizer.Add(box2, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
+        sizer.Add(box2, 0, wx.GROW|wx.ALL, 5)
         btnsizer = wx.StdDialogButtonSizer()
         btn = wx.Button(self, wx.ID_CANCEL)
         btnsizer.AddButton(btn)
@@ -986,7 +986,7 @@ class PrefProfTypes(wx.Dialog):
         btn_ok.SetDefault()
         btnsizer.AddButton(btn_ok)
         btnsizer.Realize()
-        sizer.Add(btnsizer, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.ALIGN_RIGHT, 5)
+        sizer.Add(btnsizer, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
         #self.Bind(wx.EVT_BUTTON, self.check_file, btn_ok)
         self.SetSizer(sizer)
         sizer.Fit(self)
@@ -1009,7 +1009,7 @@ class PrefSimpleFile(wx.Dialog):
         self.fbb = filebrowse.FileBrowseButton(self, -1, size=(450, -1), fileMode = 2, fileMask = self.mask)
         box2.Add(self.fbb, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
         self.fbb.SetLabel("")
-        sizer.Add(box2, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5)
+        sizer.Add(box2, 0, wx.GROW|wx.ALL, 5)
         btnsizer = wx.StdDialogButtonSizer()
         btn = wx.Button(self, wx.ID_CANCEL)
         btnsizer.AddButton(btn)
@@ -1017,7 +1017,7 @@ class PrefSimpleFile(wx.Dialog):
         btn_ok.SetDefault()
         btnsizer.AddButton(btn_ok)
         btnsizer.Realize()
-        sizer.Add(btnsizer, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.ALIGN_RIGHT, 5)
+        sizer.Add(btnsizer, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
         self.Bind(wx.EVT_BUTTON, self.check_file, btn_ok)
         self.SetSizer(sizer)
         sizer.Fit(self)
@@ -1064,8 +1064,8 @@ class StatDialog ( wx.Dialog ):
         self.radio_dictchoice.SetSelection( 0 )
         gSizer1.Add( self.radio_dictchoice, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT, 1 )
         bSizer1.Add( gSizer1, 1, wx.EXPAND, 1 )
-        self.dictpath = filebrowse.FileBrowseButton(self, -1, size=(350, -1),  labelText = _("Path"), fileMode = 2, fileMask = '*')
-        bSizer1.Add( self.dictpath, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL, 1 )
+        self.dictpath = filebrowse.FileBrowseButton(self, -1, labelText = _("Path"), fileMode = 2, fileMask = '*')
+        bSizer1.Add( self.dictpath, 0, wx.EXPAND, 1 )
         self.dictpath.Enable(False)
         m_sdbSizer1 = wx.StdDialogButtonSizer()
         self.m_sdbSizer1OK = wx.Button( self, wx.ID_OK )
@@ -1309,14 +1309,14 @@ class PrefQuestAlc ( wx.Dialog ):
         fgSizer1.Add( self.m_staticText2, 0, wx.ALL, 5 )
         self.ListActive = wx.ListBox( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, labels,  wx.LB_EXTENDED )
         self.ListActive.SetMinSize( wx.Size( 300,250 ) )
-        fgSizer1.Add( self.ListActive, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 )
+        fgSizer1.Add( self.ListActive, 0, wx.EXPAND, 5 )
         self.ListSup = wx.ListBox( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, labels, wx.LB_EXTENDED )
         self.ListSup.SetMinSize( wx.Size( 300,250 ) )
-        fgSizer1.Add( self.ListSup, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 )
+        fgSizer1.Add( self.ListSup, 0, wx.EXPAND, 5 )
         self.but_suiv = wx.Button( self, wx.ID_ANY, _("Next"), wx.DefaultPosition, wx.DefaultSize, 0 )
-        fgSizer1.Add( self.but_suiv, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+        fgSizer1.Add( self.but_suiv, 0, wx.EXPAND, 5 )
         self.but_prec = wx.Button( self, wx.ID_ANY, _("Previous"), wx.DefaultPosition, wx.DefaultSize, 0 )
-        fgSizer1.Add( self.but_prec, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+        fgSizer1.Add( self.but_prec, 0, wx.EXPAND, 5 )
         if not sim :
             self.lab_nbcl = wx.StaticText( self, wx.ID_ANY, _("Number of terminal clusters on phase 1"), wx.DefaultPosition, wx.DefaultSize, 0 )
             self.lab_nbcl.Wrap( -1 )
@@ -1324,7 +1324,7 @@ class PrefQuestAlc ( wx.Dialog ):
             self.spin_nbcl = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 2, 100, 10 )
             self.spin_nbcl.SetValue(10)
             self.spin_nbcl.SetMinSize( wx.Size( 100,30 ) )
-            fgSizer1.Add( self.spin_nbcl, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+            fgSizer1.Add( self.spin_nbcl, 0, wx.EXPAND, 5 )
             self.lab_mincl = wx.StaticText( self, wx.ID_ANY, _("Minimum text segments frenquency in clusters (2= automatic)"), wx.DefaultPosition, wx.DefaultSize, 0 )
             self.lab_mincl.Wrap( -1 )
             fgSizer1.Add( self.lab_mincl, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 )
@@ -1339,7 +1339,7 @@ class PrefQuestAlc ( wx.Dialog ):
         self.m_sdbSizer2Cancel = wx.Button( self, wx.ID_CANCEL )
         m_sdbSizer2.AddButton( self.m_sdbSizer2Cancel )
         m_sdbSizer2.Realize();
-        bSizer2.Add( m_sdbSizer2, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 )
+        bSizer2.Add( m_sdbSizer2, 0, wx.ALIGN_RIGHT|wx.ALL, 5 )
         self.SetSizer( bSizer2 )
         self.Layout()
         bSizer2.Fit( self )
@@ -1769,7 +1769,7 @@ class OptLexi(wx.Dialog):
             sizer_2.Add(self.label, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL, 3)
             sizer_2.Add(self.spin, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 3)
         sizer_1.Add(sizer_2, 0, wx.ALIGN_CENTER_HORIZONTAL, 3)
-        sizer_1.Add(sizer_3, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_RIGHT, 3)
+        sizer_1.Add(sizer_3, 0, wx.ALIGN_RIGHT, 3)
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
         self.Layout()
@@ -2146,12 +2146,12 @@ class ChiDialog(wx.Dialog):
         sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
         sizer_4 = wx.BoxSizer(wx.HORIZONTAL)
         sizer_3.Add(self.list_box_1, 0, wx.EXPAND, 0)
-        sizer_3.Add(self.list_box_2, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0)
+        sizer_3.Add(self.list_box_2, 0, wx.EXPAND, 0)
         sizer_2.Add(sizer_3, 1, wx.EXPAND, 0)
-        sizer_4.Add(self.button_cancel, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL, 0)
-        sizer_4.Add(self.button_pref, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL, 0)
-        sizer_4.Add(self.button_1, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL, 0)
-        sizer_2.Add(sizer_4, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL, 0)
+        sizer_4.Add(self.button_cancel, 0, wx.ALL, 0)
+        sizer_4.Add(self.button_pref, 0, wx.ALL, 0)
+        sizer_4.Add(self.button_1, 0, wx.ALL, 0)
+        sizer_2.Add(sizer_4, 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
         sizer_1.Add(sizer_2, 1, wx.EXPAND, 0)
         self.SetSizer(sizer_1)
         sizer_1.Fit(self)
@@ -2687,11 +2687,11 @@ class ProtoDial ( wx.Dialog ):
         variablesChoices = headers
         self.variables = wx.ListBox( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, variablesChoices, wx.LB_HSCROLL|wx.LB_MULTIPLE )
         self.variables.SetMinSize( wx.Size( 350,-1 ) )
-        fgSizer1.Add( self.variables, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 )
+        fgSizer1.Add( self.variables, 0, wx.EXPAND, 5 )
         rangsChoices = headers
         self.rangs = wx.ListBox( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, rangsChoices, wx.LB_HSCROLL|wx.LB_MULTIPLE )
         self.rangs.SetMinSize( wx.Size( 350,-1 ) )
-        fgSizer1.Add( self.rangs, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 )
+        fgSizer1.Add( self.rangs, 0, wx.EXPAND, 5 )
         bSizer1.Add( fgSizer1, 1, wx.ALIGN_CENTER_HORIZONTAL, 5 )
         fgSizer3 = wx.FlexGridSizer( 0, 2, 0, 0 )
         fgSizer3.SetFlexibleDirection( wx.BOTH )