From e442736ee35294245db4279dbbf0870652d7f85a Mon Sep 17 00:00:00 2001 From: Metallicow Date: Thu, 20 Jun 2019 19:46:45 -0500 Subject: [PATCH] Fix some sizer issues with wxPy4.1 --- demo/Img2PyArtProvider.py | 2 +- demo/MimeTypesManager.py | 12 ++++----- demo/Throbber.py | 20 +++++++------- demo/TimeCtrl.py | 12 ++++----- demo/agw/BalloonTip.py | 2 +- demo/agw/CustomTreeCtrl.py | 16 +++++------ demo/agw/GenericMessageDialog.py | 2 +- demo/agw/GradientButton.py | 14 +++++----- demo/agw/HyperTreeList.py | 16 +++++------ demo/agw/PyGauge.py | 8 +++--- demo/agw/SuperToolTip.py | 46 ++++++++++++++++---------------- demo/agw/ThumbnailCtrl.py | 4 +-- demo/agw/ZoomBar.py | 8 +++--- wx/lib/agw/cubecolourdialog.py | 2 +- wx/lib/agw/multidirdialog.py | 4 +-- wx/lib/agw/shortcuteditor.py | 2 +- wx/lib/itemspicker.py | 2 +- 17 files changed, 86 insertions(+), 86 deletions(-) diff --git a/demo/Img2PyArtProvider.py b/demo/Img2PyArtProvider.py index 6b529700..35b292ee 100644 --- a/demo/Img2PyArtProvider.py +++ b/demo/Img2PyArtProvider.py @@ -20,7 +20,7 @@ class TestPanel(wx.Panel): sizer.Add(title, 0, wx.ALIGN_CENTRE|wx.ALL, 5) line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL) - sizer.Add(line, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + sizer.Add(line, 0, wx.GROW|wx.ALL, 5) sizer.Add((20,20)) box = wx.BoxSizer(wx.HORIZONTAL) diff --git a/demo/MimeTypesManager.py b/demo/MimeTypesManager.py index e0054cea..79bc3abe 100644 --- a/demo/MimeTypesManager.py +++ b/demo/MimeTypesManager.py @@ -171,21 +171,21 @@ class MimeTypesDemoPanel(wx.Panel): t = wx.StaticText(self, -1, 'Known MIME types') t.SetFont(bfont) - lrsizer.Add(t, 0, wx.ALL | wx.EXPAND | wx.ALIGN_CENTER, 4) + lrsizer.Add(t, 0, wx.ALL | wx.EXPAND, 4) self.mimelist = wx.ListBox(self, -1, choices=[], style = wx.LB_SINGLE)# | wx.LB_SORT) - lrsizer.Add(self.mimelist, 1, wx.ALL | wx.EXPAND | wx.ALIGN_CENTER | wx.FIXED_MINSIZE, 4) + lrsizer.Add(self.mimelist, 1, wx.ALL | wx.EXPAND | wx.FIXED_MINSIZE, 4) self.Bind(wx.EVT_LISTBOX, self.OnListbox, self.mimelist) #---------------------------------------------------------------------------- - lsizer.Add(llsizer, 1, wx.ALL | wx.EXPAND | wx.ALIGN_CENTER, 4) - lsizer.Add(lrsizer, 0, wx.ALL | wx.EXPAND | wx.ALIGN_CENTER, 4) + lsizer.Add(llsizer, 1, wx.ALL | wx.EXPAND, 4) + lsizer.Add(lrsizer, 0, wx.ALL | wx.EXPAND, 4) #---------------------------------------------------------------------------- - tsizer.Add(usizer, 0, wx.ALL | wx.EXPAND | wx.ALIGN_CENTER, 4) - tsizer.Add(lsizer, 1, wx.ALL | wx.EXPAND | wx.ALIGN_CENTER, 4) + tsizer.Add(usizer, 0, wx.ALL | wx.EXPAND, 4) + tsizer.Add(lsizer, 1, wx.ALL | wx.EXPAND, 4) #---------------------------------------------------------------------------- diff --git a/demo/Throbber.py b/demo/Throbber.py index c3389a5a..2f936f13 100644 --- a/demo/Throbber.py +++ b/demo/Throbber.py @@ -121,8 +121,8 @@ class TestPanel(wx.Panel): buttonBox = wx.BoxSizer(wx.HORIZONTAL) buttonBox.AddMany([ - (startButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5), - (stopButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5), + (startButton, 0, wx.ALL, 5), + (stopButton, 0, wx.ALL, 5), ]) sizer.Add( @@ -156,18 +156,18 @@ class TestPanel(wx.Panel): customBox1 = wx.BoxSizer(wx.HORIZONTAL) customBox1.AddMany([ - (nextButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5), - (prevButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5), - (incButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5), - (decButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5), - (revButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5), + (nextButton, 0, wx.ALL, 5), + (prevButton, 0, wx.ALL, 5), + (incButton, 0, wx.ALL, 5), + (decButton, 0, wx.ALL, 5), + (revButton, 0, wx.ALL, 5), ]) customBox2 = wx.BoxSizer(wx.HORIZONTAL) customBox2.AddMany([ - (restButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5), - (startButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5), - (stopButton, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALL, 5), + (restButton, 0, wx.ALL, 5), + (startButton, 0, wx.ALL, 5), + (stopButton, 0, wx.ALL, 5), ]) sizer.Add( customBox1, (len(self.throbbers) + 5, 0), (1, 3), flag = wx.ALIGN_CENTER ) diff --git a/demo/TimeCtrl.py b/demo/TimeCtrl.py index 5bc7322c..402f72ae 100644 --- a/demo/TimeCtrl.py +++ b/demo/TimeCtrl.py @@ -70,17 +70,17 @@ class TestPanel( scrolled.ScrolledPanel ): self.radioMx = wx.RadioButton( self, -1, "Set controls to 'now' using mxDateTime") radio_vbox = wx.BoxSizer( wx.VERTICAL ) - radio_vbox.Add( self.radio12to24, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - radio_vbox.Add( self.radio24to12, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - radio_vbox.Add( self.radioWx, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - radio_vbox.Add( self.radioMx, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + radio_vbox.Add( self.radio12to24, 0, wx.ALL, 5 ) + radio_vbox.Add( self.radio24to12, 0, wx.ALL, 5 ) + radio_vbox.Add( self.radioWx, 0, wx.ALL, 5 ) + radio_vbox.Add( self.radioMx, 0, wx.ALL, 5 ) buttonbox.Add( buttonChange, 0, wx.ALIGN_CENTRE|wx.ALL, 5 ) buttonbox.Add( radio_vbox, 0, wx.ALIGN_CENTRE|wx.ALL, 5 ) hbox = wx.BoxSizer( wx.HORIZONTAL ) hbox.Add( grid, 0, wx.ALIGN_LEFT|wx.ALL, 15 ) - hbox.Add( buttonbox, 0, wx.ALIGN_RIGHT|wx.BOTTOM, 20 ) + hbox.Add( buttonbox, 0, wx.BOTTOM, 20 ) box_label = wx.StaticBox( self, -1, "Bounds Control" ) @@ -119,7 +119,7 @@ class TestPanel( scrolled.ScrolledPanel ): grid2.Add( (20, 0), 0, wx.ALIGN_LEFT|wx.ALL, 5 ) grid2.Add( label, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) grid2.Add( self.target_ctrl, 0, wx.ALIGN_LEFT|wx.ALL, 5 ) - boundsbox.Add(grid2, 0, wx.ALIGN_CENTER|wx.EXPAND|wx.ALL, 5) + boundsbox.Add(grid2, 0, wx.EXPAND|wx.ALL, 5) vbox = wx.BoxSizer( wx.VERTICAL ) vbox.Add( (20, 20) ) diff --git a/demo/agw/BalloonTip.py b/demo/agw/BalloonTip.py index 991d0554..d18e0b5d 100644 --- a/demo/agw/BalloonTip.py +++ b/demo/agw/BalloonTip.py @@ -135,7 +135,7 @@ class BalloonTipDemo(wx.Frame): mainsizer.Add(treecontrol, 0, wx.EXPAND, wx.ALL, 10) mainsizer.Add(slider, 0, wx.ALL, 10) mainsizer.Add(textctrl2, 0, wx.ALL, 10) - mainsizer.Add(statictext, 0, wx.EXPAND | wx.ALIGN_CENTER | wx.ALL, 10) + mainsizer.Add(statictext, 0, wx.EXPAND | wx.ALL, 10) mainsizer.Add(bitmapbutton, 0, wx.ALL, 10) mainsizer.Add(button2, 0, wx.ALL, 10) diff --git a/demo/agw/CustomTreeCtrl.py b/demo/agw/CustomTreeCtrl.py index 8e0e04bd..3c59d74b 100644 --- a/demo/agw/CustomTreeCtrl.py +++ b/demo/agw/CustomTreeCtrl.py @@ -865,7 +865,7 @@ class CustomTreeCtrlDemo(wx.Panel): buttonconnection.Bind(wx.EVT_BUTTON, self.OnButtonConnection) sizer1.Add(label, 0, wx.ALL|wx.ALIGN_CENTER, 5) sizer1.Add((1,0), 1, wx.EXPAND) - sizer1.Add(buttonconnection, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_RIGHT, 5) + sizer1.Add(buttonconnection, 0, wx.ALL, 5) sizer2 = wx.BoxSizer(wx.HORIZONTAL) label = wx.StaticText(pnl, -1, "Border Pen") @@ -876,7 +876,7 @@ class CustomTreeCtrlDemo(wx.Panel): buttonborder.Bind(wx.EVT_BUTTON, self.OnButtonBorder) sizer2.Add(label, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.ALIGN_CENTER, 5) sizer2.Add((1,0), 1, wx.EXPAND) - sizer2.Add(buttonborder, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_RIGHT, 5) + sizer2.Add(buttonborder, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM, 5) sizer3 = wx.BoxSizer(wx.HORIZONTAL) label = wx.StaticText(pnl, -1, "Tree Buttons") @@ -887,7 +887,7 @@ class CustomTreeCtrlDemo(wx.Panel): buttontree.Bind(wx.EVT_BUTTON, self.OnButtonTree) sizer3.Add(label, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.ALIGN_CENTER, 5) sizer3.Add((1,0), 1, wx.EXPAND) - sizer3.Add(buttontree, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_RIGHT, 5) + sizer3.Add(buttontree, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM, 5) sizer4 = wx.BoxSizer(wx.HORIZONTAL) label = wx.StaticText(pnl, -1, "Check/Radio Buttons") @@ -898,7 +898,7 @@ class CustomTreeCtrlDemo(wx.Panel): buttoncr.Bind(wx.EVT_BUTTON, self.OnButtonCheckRadio) sizer4.Add(label, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.ALIGN_CENTER, 5) sizer4.Add((1,0), 1, wx.EXPAND) - sizer4.Add(buttoncr, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_RIGHT, 5) + sizer4.Add(buttoncr, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM, 5) sizer5 = wx.BoxSizer(wx.HORIZONTAL) radioimage = wx.RadioButton(pnl, -1, "Image Background", style=wx.RB_GROUP) @@ -907,7 +907,7 @@ class CustomTreeCtrlDemo(wx.Panel): self.imagebutton.Bind(wx.EVT_BUTTON, self.OnChooseImage) sizer5.Add(radioimage, 0, wx.ALL|wx.ALIGN_CENTER, 5) sizer5.Add((1,0), 1, wx.EXPAND) - sizer5.Add(self.imagebutton, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_RIGHT, 5) + sizer5.Add(self.imagebutton, 0, wx.ALL, 5) sizer6 = wx.BoxSizer(wx.HORIZONTAL) radiobackground = wx.RadioButton(pnl, -1, "Background Colour") @@ -947,7 +947,7 @@ class CustomTreeCtrlDemo(wx.Panel): sizera1.Add(self.unfocus, 0) sizera.Add(self.checknormal, 0, wx.ALL, 3) sizera.Add((1, 0), 1, wx.EXPAND) - sizera.Add(sizera1, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL|wx.EXPAND, 3) + sizera.Add(sizera1, 0, wx.ALL|wx.EXPAND, 3) sizerb = wx.BoxSizer(wx.VERTICAL) self.checkgradient = wx.CheckBox(pnl, -1, "Gradient Theme") @@ -969,8 +969,8 @@ class CustomTreeCtrlDemo(wx.Panel): self.tree.GetSecondGradientColour()) self.firstcolour.Bind(csel.EVT_COLOURSELECT, self.OnFirstColour) self.secondcolour.Bind(csel.EVT_COLOURSELECT, self.OnSecondColour) - sizerb3.Add(self.firstcolour, 0, wx.TOP|wx.BOTTOM|wx.ALIGN_CENTER_HORIZONTAL, 3) - sizerb3.Add(self.secondcolour, 0, wx.LEFT|wx.TOP|wx.BOTTOM|wx.ALIGN_CENTER_HORIZONTAL, 3) + sizerb3.Add(self.firstcolour, 0, wx.TOP|wx.BOTTOM, 3) + sizerb3.Add(self.secondcolour, 0, wx.LEFT|wx.TOP|wx.BOTTOM, 3) sizerb.Add(self.checkgradient, 0, wx.ALL, 3) sizerb.Add(sizerb1, 0) sizerb.Add(sizerb2, 0) diff --git a/demo/agw/GenericMessageDialog.py b/demo/agw/GenericMessageDialog.py index fc0456c3..e1a1a951 100644 --- a/demo/agw/GenericMessageDialog.py +++ b/demo/agw/GenericMessageDialog.py @@ -106,7 +106,7 @@ class GenericMessageDialogDemo(wx.Panel): mainSizer.Add(self.buttonKinds, 0, wx.ALL, 5) mainSizer.Add(self.dialogStyles, 0, wx.ALL, 5) mainSizer.Add((10, 0), 0, 0, 0) - mainSizer.Add(self.showDialog, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL, 10) + mainSizer.Add(self.showDialog, 0, wx.ALL, 10) mainSizer.Add((10, 0), 0, 0, 0) panelSizer.Add(mainSizer, 1, wx.EXPAND) diff --git a/demo/agw/GradientButton.py b/demo/agw/GradientButton.py index 470f3e1e..300a6f43 100644 --- a/demo/agw/GradientButton.py +++ b/demo/agw/GradientButton.py @@ -64,8 +64,8 @@ class GradientButtonDemo(wx.Panel): label1 = wx.StaticText(self.mainPanel, -1, "Welcome to the GradientButton demo for wxPython!") mainSizer.Add(label1, 0, wx.EXPAND|wx.LEFT|wx.RIGHT|wx.TOP, 10) - mainSizer.Add(self.btn1, 0, wx.ALIGN_CENTER_VERTICAL|wx.LEFT|wx.RIGHT|wx.TOP, 15) - btnSizer.Add(self.btn2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + mainSizer.Add(self.btn1, 0, wx.LEFT|wx.RIGHT|wx.TOP, 15) + btnSizer.Add(self.btn2, 0, wx.ALL, 5) btnSizer.Add((20, 0)) firstStrings = ["Top Start", "Bottom Start", "Pressed Top", "Text Colour"] @@ -73,17 +73,17 @@ class GradientButtonDemo(wx.Panel): for strings in firstStrings: label = wx.StaticText(self.mainPanel, -1, strings) - colourSizer.Add(label, 0, wx.ALIGN_CENTER|wx.EXPAND) + colourSizer.Add(label, 0, wx.EXPAND) for strings in firstStrings: - colourSizer.Add(self.FindWindowByName(strings), 0, wx.ALIGN_CENTER|wx.BOTTOM|wx.EXPAND, 10) + colourSizer.Add(self.FindWindowByName(strings), 0, wx.BOTTOM|wx.EXPAND, 10) for strings in secondStrings: label = wx.StaticText(self.mainPanel, -1, strings) - colourSizer.Add(label, 0, wx.ALIGN_CENTER|wx.EXPAND) + colourSizer.Add(label, 0, wx.EXPAND) for strings in secondStrings[:-1]: - colourSizer.Add(self.FindWindowByName(strings), 0, wx.ALIGN_CENTER|wx.EXPAND, 10) + colourSizer.Add(self.FindWindowByName(strings), 0, wx.EXPAND, 10) - btnSizer.Add(colourSizer, 0, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL) + btnSizer.Add(colourSizer, 0, wx.EXPAND) btnSizer.Add((10, 0)) mainSizer.Add(btnSizer, 0, wx.EXPAND|wx.ALL, 10) diff --git a/demo/agw/HyperTreeList.py b/demo/agw/HyperTreeList.py index 7135a4a2..5fe62ecd 100644 --- a/demo/agw/HyperTreeList.py +++ b/demo/agw/HyperTreeList.py @@ -1217,7 +1217,7 @@ class HyperTreeListDemo(wx.Frame): buttonconnection.Bind(wx.EVT_BUTTON, self.OnButtonConnection) sizer1.Add(label, 0, wx.ALL|wx.ALIGN_CENTER, 5) sizer1.Add((1,0), 1, wx.EXPAND) - sizer1.Add(buttonconnection, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_RIGHT, 5) + sizer1.Add(buttonconnection, 0, wx.ALL, 5) sizer2 = wx.BoxSizer(wx.HORIZONTAL) label = wx.StaticText(self.leftpanel, -1, "Border Pen") @@ -1228,7 +1228,7 @@ class HyperTreeListDemo(wx.Frame): buttonborder.Bind(wx.EVT_BUTTON, self.OnButtonBorder) sizer2.Add(label, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.ALIGN_CENTER, 5) sizer2.Add((1,0), 1, wx.EXPAND) - sizer2.Add(buttonborder, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_RIGHT, 5) + sizer2.Add(buttonborder, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM, 5) sizer3 = wx.BoxSizer(wx.HORIZONTAL) label = wx.StaticText(self.leftpanel, -1, "Tree Buttons") @@ -1239,7 +1239,7 @@ class HyperTreeListDemo(wx.Frame): buttontree.Bind(wx.EVT_BUTTON, self.OnButtonTree) sizer3.Add(label, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.ALIGN_CENTER, 5) sizer3.Add((1,0), 1, wx.EXPAND) - sizer3.Add(buttontree, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_RIGHT, 5) + sizer3.Add(buttontree, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM, 5) sizer4 = wx.BoxSizer(wx.HORIZONTAL) label = wx.StaticText(self.leftpanel, -1, "Check/Radio Buttons") @@ -1250,7 +1250,7 @@ class HyperTreeListDemo(wx.Frame): buttoncr.Bind(wx.EVT_BUTTON, self.OnButtonCheckRadio) sizer4.Add(label, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.ALIGN_CENTER, 5) sizer4.Add((1,0), 1, wx.EXPAND) - sizer4.Add(buttoncr, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_RIGHT, 5) + sizer4.Add(buttoncr, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM, 5) sizer5 = wx.BoxSizer(wx.HORIZONTAL) radioimage = wx.RadioButton(self.leftpanel, -1, "Image Background", style=wx.RB_GROUP) @@ -1259,7 +1259,7 @@ class HyperTreeListDemo(wx.Frame): self.imagebutton.Bind(wx.EVT_BUTTON, self.OnChooseImage) sizer5.Add(radioimage, 0, wx.ALL|wx.ALIGN_CENTER, 5) sizer5.Add((1,0), 1, wx.EXPAND) - sizer5.Add(self.imagebutton, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_RIGHT, 5) + sizer5.Add(self.imagebutton, 0, wx.ALL, 5) sizer6 = wx.BoxSizer(wx.HORIZONTAL) radiobackground = wx.RadioButton(self.leftpanel, -1, "Background Colour") @@ -1291,7 +1291,7 @@ class HyperTreeListDemo(wx.Frame): sizera1.Add(self.unfocus, 0) sizera.Add(self.checknormal, 0, wx.ALL, 3) sizera.Add((1, 0), 1, wx.EXPAND) - sizera.Add(sizera1, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL|wx.EXPAND, 3) + sizera.Add(sizera1, 0, wx.ALL|wx.EXPAND, 3) sizerb = wx.BoxSizer(wx.VERTICAL) self.checkgradient = wx.CheckBox(self.leftpanel, -1, "Gradient Theme") @@ -1313,8 +1313,8 @@ class HyperTreeListDemo(wx.Frame): self.tree.GetSecondGradientColour()) self.firstcolour.Bind(csel.EVT_COLOURSELECT, self.OnFirstColour) self.secondcolour.Bind(csel.EVT_COLOURSELECT, self.OnSecondColour) - sizerb3.Add(self.firstcolour, 0, wx.TOP|wx.BOTTOM|wx.ALIGN_CENTER_HORIZONTAL, 3) - sizerb3.Add(self.secondcolour, 0, wx.LEFT|wx.TOP|wx.BOTTOM|wx.ALIGN_CENTER_HORIZONTAL, 3) + sizerb3.Add(self.firstcolour, 0, wx.TOP|wx.BOTTOM, 3) + sizerb3.Add(self.secondcolour, 0, wx.LEFT|wx.TOP|wx.BOTTOM, 3) sizerb.Add(self.checkgradient, 0, wx.ALL, 3) sizerb.Add(sizerb1, 0) sizerb.Add(sizerb2, 0) diff --git a/demo/agw/PyGauge.py b/demo/agw/PyGauge.py index 50b91d4b..fa059392 100644 --- a/demo/agw/PyGauge.py +++ b/demo/agw/PyGauge.py @@ -70,9 +70,9 @@ class PyGaugeDemo(wx.Panel): label1 = wx.StaticText(self.mainPanel, -1, "Welcome to the PyGauge demo for wxPython!") mainSizer.Add(label1, 0, wx.EXPAND|wx.LEFT|wx.RIGHT|wx.TOP, 10) - mainSizer.Add(self.gauge1, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 20) - mainSizer.Add(self.gauge2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 20) - mainSizer.Add(self.gauge3, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 20) + mainSizer.Add(self.gauge1, 0, wx.ALL, 20) + mainSizer.Add(self.gauge2, 0, wx.ALL, 20) + mainSizer.Add(self.gauge3, 0, wx.ALL, 20) labelBack = wx.StaticText(self.mainPanel, -1, "Background Colour") labelHover = wx.StaticText(self.mainPanel, -1, "Border Colour") @@ -95,7 +95,7 @@ class PyGaugeDemo(wx.Panel): colourSizer.Add(self.gaugeRange, 0, wx.EXPAND) colourSizer.Add(self.gaugePadding, 0, wx.EXPAND) - mainSizer.Add(colourSizer, 0, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL|wx.LEFT|wx.RIGHT, 10) + mainSizer.Add(colourSizer, 0, wx.EXPAND|wx.LEFT|wx.RIGHT, 10) boldFont = wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT) diff --git a/demo/agw/SuperToolTip.py b/demo/agw/SuperToolTip.py index 9bacaf83..5e65f06b 100644 --- a/demo/agw/SuperToolTip.py +++ b/demo/agw/SuperToolTip.py @@ -165,43 +165,43 @@ class SuperToolTipDemo(wx.Frame): colourSizer = wx.StaticBoxSizer(self.colourSizer_staticbox, wx.VERTICAL) colourSizer_2 = wx.BoxSizer(wx.HORIZONTAL) colourSizer_1 = wx.BoxSizer(wx.HORIZONTAL) - colourSizer_1.Add(self.stylesRadio, 0, wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5) - colourSizer_1.Add(self.stylesCombo, 1, wx.RIGHT|wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 5) + colourSizer_1.Add(self.stylesRadio, 0, wx.LEFT|wx.RIGHT, 5) + colourSizer_1.Add(self.stylesCombo, 1, wx.RIGHT|wx.EXPAND, 5) colourSizer.Add(colourSizer_1, 1, wx.EXPAND, 0) - colourSizer_2.Add(self.customStyles, 0, wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5) + colourSizer_2.Add(self.customStyles, 0, wx.LEFT|wx.RIGHT, 5) label_1 = wx.StaticText(self.mainPanel, -1, "Top:") - colourSizer_2.Add(label_1, 0, wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 3) - colourSizer_2.Add(self.topColourPicker, 0, wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5) + colourSizer_2.Add(label_1, 0, wx.RIGHT, 3) + colourSizer_2.Add(self.topColourPicker, 0, wx.RIGHT, 5) label_2 = wx.StaticText(self.mainPanel, -1, "Middle:") - colourSizer_2.Add(label_2, 0, wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 3) - colourSizer_2.Add(self.middleColourPicker, 0, wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5) + colourSizer_2.Add(label_2, 0, wx.RIGHT, 3) + colourSizer_2.Add(self.middleColourPicker, 0, wx.RIGHT, 5) label_3 = wx.StaticText(self.mainPanel, -1, "Bottom:") - colourSizer_2.Add(label_3, 0, wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 3) - colourSizer_2.Add(self.bottomColourPicker, 0, wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5) + colourSizer_2.Add(label_3, 0, wx.RIGHT, 3) + colourSizer_2.Add(self.bottomColourPicker, 0, wx.RIGHT, 5) colourSizer.Add(colourSizer_2, 1, wx.EXPAND, 0) mainSizer.Add(colourSizer, 0, wx.ALL|wx.EXPAND, 5) headerSizer.Add(self.headerCheck, 0, wx.ALL, 5) label_4 = wx.StaticText(self.mainPanel, -1, "Header Text:") - headerSizer_1.Add(label_4, 0, wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5) - headerSizer_1.Add(self.headerText, 1, wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5) + headerSizer_1.Add(label_4, 0, wx.RIGHT, 5) + headerSizer_1.Add(self.headerText, 1, wx.RIGHT, 5) headerSizer.Add(headerSizer_1, 1, wx.LEFT|wx.RIGHT|wx.EXPAND, 5) label_5 = wx.StaticText(self.mainPanel, -1, "Header Bitmap:") - headerSizer_2.Add(label_5, 0, wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5) - headerSizer_2.Add(self.headerBitmap, 0, wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5) - headerSizer_2.Add(self.headerFilePicker, 1, wx.RIGHT|wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 5) + headerSizer_2.Add(label_5, 0, wx.RIGHT, 5) + headerSizer_2.Add(self.headerBitmap, 0, wx.RIGHT, 5) + headerSizer_2.Add(self.headerFilePicker, 1, wx.RIGHT|wx.EXPAND, 5) headerSizer.Add(headerSizer_2, 1, wx.ALL|wx.EXPAND, 5) headerSizer.Add(self.headerLineCheck, 0, wx.ALL, 5) footerSizer.Add(self.footerCheck, 0, wx.ALL, 5) label_6 = wx.StaticText(self.mainPanel, -1, "Footer Text:") - footerSizer_1.Add(label_6, 0, wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5) - footerSizer_1.Add(self.footerText, 1, wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5) + footerSizer_1.Add(label_6, 0, wx.RIGHT, 5) + footerSizer_1.Add(self.footerText, 1, wx.RIGHT, 5) footerSizer.Add(footerSizer_1, 1, wx.LEFT|wx.RIGHT|wx.EXPAND, 5) label_7 = wx.StaticText(self.mainPanel, -1, "Footer Bitmap:") - footerSizer_2.Add(label_7, 0, wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5) - footerSizer_2.Add(self.footerBitmap, 0, wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 5) - footerSizer_2.Add(self.footerFilePicker, 1, wx.RIGHT|wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 5) + footerSizer_2.Add(label_7, 0, wx.RIGHT, 5) + footerSizer_2.Add(self.footerBitmap, 0, wx.RIGHT, 5) + footerSizer_2.Add(self.footerFilePicker, 1, wx.RIGHT|wx.EXPAND, 5) footerSizer.Add(footerSizer_2, 1, wx.ALL|wx.EXPAND, 5) footerSizer.Add(self.footerLineCheck, 0, wx.ALL, 5) @@ -209,14 +209,14 @@ class SuperToolTipDemo(wx.Frame): topSizer.Add(footerSizer, 1, wx.EXPAND|wx.ALL, 5) mainSizer.Add(topSizer, 0, wx.TOP|wx.BOTTOM|wx.EXPAND, 5) - bodySizer.Add(self.bodyBitmap, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5) + bodySizer.Add(self.bodyBitmap, 0, wx.ALL, 5) bodySizer_2.Add(self.bodyText, 1, wx.EXPAND, 0) bodySizer_2.Add(self.includeCheck, 0, wx.RIGHT|wx.TOP, 5) - bodySizer.Add(bodySizer_2, 1, wx.ALL|wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 5) + bodySizer.Add(bodySizer_2, 1, wx.ALL|wx.EXPAND, 5) mainSizer.Add(bodySizer, 0, wx.ALL|wx.EXPAND, 5) - otherSizer.Add(self.dropShadow, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5) - otherSizer.Add(self.useFade, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.ALIGN_CENTER_VERTICAL, 5) + otherSizer.Add(self.dropShadow, 0, wx.ALL, 5) + otherSizer.Add(self.useFade, 0, wx.LEFT|wx.RIGHT|wx.BOTTOM, 5) label_8 = wx.StaticText(self.mainPanel, -1, "No Of Seconds SuperToolTip Is Shown:") otherSizer.Add((0, 5)) otherSizer.Add(label_8, 0, wx.LEFT|wx.RIGHT, 5) diff --git a/demo/agw/ThumbnailCtrl.py b/demo/agw/ThumbnailCtrl.py index 663b698d..34da890d 100644 --- a/demo/agw/ThumbnailCtrl.py +++ b/demo/agw/ThumbnailCtrl.py @@ -154,8 +154,8 @@ class ThumbnailCtrlDemo(wx.Frame): zoomsizer.Add(self.textzoom, 1, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 3) zoomsizer.Add(self.zoombutton, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 3) optionsizer.Add(zoomsizer, 1, wx.EXPAND, 0) - optionsizer.Add(self.fontbutton, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 3) - optionsizer.Add(self.colourbutton, 0, wx.TOP|wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 3) + optionsizer.Add(self.fontbutton, 0, wx.ALL|wx.ADJUST_MINSIZE, 3) + optionsizer.Add(self.colourbutton, 0, wx.TOP|wx.LEFT|wx.ADJUST_MINSIZE, 3) splitsizer.Add(optionsizer, 0, wx.EXPAND | wx.TOP|wx.LEFT, 5) self.panel.SetAutoLayout(True) self.panel.SetSizer(splitsizer) diff --git a/demo/agw/ZoomBar.py b/demo/agw/ZoomBar.py index a8ac920a..376ce349 100644 --- a/demo/agw/ZoomBar.py +++ b/demo/agw/ZoomBar.py @@ -123,10 +123,10 @@ class TestPanel(wx.Panel): sizer_2.Add(sizer_3, 0, wx.EXPAND|wx.ALL, 5) - sizer_2.Add(self.centerZoom, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5) - sizer_2.Add(self.showReflections, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5) - sizer_2.Add(self.showLabels, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5) - sizer_2.Add(self.enableButton, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5) + sizer_2.Add(self.centerZoom, 0, wx.ALL, 5) + sizer_2.Add(self.showReflections, 0, wx.ALL, 5) + sizer_2.Add(self.showLabels, 0, wx.ALL, 5) + sizer_2.Add(self.enableButton, 0, wx.ALL, 5) sizer_1.Add(sizer_2, 1, wx.EXPAND, 0) centerSizer.Add(sizer_1, 0, wx.EXPAND, 0) centerSizer.Add(self.zbp, 0, wx.TOP|wx.EXPAND, 20) diff --git a/wx/lib/agw/cubecolourdialog.py b/wx/lib/agw/cubecolourdialog.py index 54574a3d..0933a687 100644 --- a/wx/lib/agw/cubecolourdialog.py +++ b/wx/lib/agw/cubecolourdialog.py @@ -3006,7 +3006,7 @@ class CubeColourDialog(wx.Dialog): customLabel = wx.StaticText(self.mainPanel, -1, _("Custom Colours")) customSizer.Add(customLabel, 0, wx.BOTTOM, 3) customSizer.Add(self.customColours, 0) - customSizer.Add(self.addCustom, 0, wx.TOP|wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL, 5) + customSizer.Add(self.addCustom, 0, wx.TOP|wx.ALIGN_LEFT, 5) mainSizer.Add(customSizer, (0, 2), (2, 2), wx.ALIGN_CENTER|wx.LEFT|wx.RIGHT, 5) rgbSizer.Add(self.rgbBitmap, 0, wx.ALL, 15) diff --git a/wx/lib/agw/multidirdialog.py b/wx/lib/agw/multidirdialog.py index 8d839666..09f86252 100644 --- a/wx/lib/agw/multidirdialog.py +++ b/wx/lib/agw/multidirdialog.py @@ -426,8 +426,8 @@ class MultiDirDialog(wx.Dialog): mainSizer.Add(self.dirCtrl, 1, wx.EXPAND|wx.ALL, 10) label = wx.StaticText(self, -1, _("Folder:")) - textSizer.Add(label, 0, wx.LEFT|wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 10) - textSizer.Add(self.folderText, 1, wx.RIGHT|wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 10) + textSizer.Add(label, 0, wx.LEFT|wx.RIGHT, 10) + textSizer.Add(self.folderText, 1, wx.RIGHT|wx.EXPAND, 10) mainSizer.Add(textSizer, 0, wx.EXPAND|wx.BOTTOM, 10) # Add the fancy buttons diff --git a/wx/lib/agw/shortcuteditor.py b/wx/lib/agw/shortcuteditor.py index 5bf37e8a..e09331bd 100644 --- a/wx/lib/agw/shortcuteditor.py +++ b/wx/lib/agw/shortcuteditor.py @@ -2340,7 +2340,7 @@ class ShortcutEditor(wx.Dialog): def MenuItemSearch(menu, item): for menuItem in list(menu.GetMenuItems()): - label = menuItem.GetLabel() + label = menuItem.GetItemLabel() if not label: # It's a separator diff --git a/wx/lib/itemspicker.py b/wx/lib/itemspicker.py index 3a6daea0..7727e2a7 100644 --- a/wx/lib/itemspicker.py +++ b/wx/lib/itemspicker.py @@ -117,7 +117,7 @@ class ItemsPicker(wx.Panel): self.bAdd.Bind(wx.EVT_BUTTON, self._OnAdd) self.bRemove = wx.Button(self, -1, label = '<- Remove') self.bRemove.Bind(wx.EVT_BUTTON, self._OnRemove) - sizer.Add(self.bAdd, 0, wx.EXPAND|wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5) + sizer.Add(self.bAdd, 0, wx.EXPAND|wx.ALL, 5) sizer.Add(self.bRemove, 0, wx.EXPAND|wx.ALL, 5) return sizer