Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 09:40:07 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix some sizer issues with wxPy4.1

Browse Source
This commit is contained in:
Metallicow
2019-06-20 19:46:45 -05:00
parent 2bfa54af35
commit e442736ee3
17 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Img2PyArtProvider.py
View File

@@ -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)

12
demo/MimeTypesManager.py
View File

@@ -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)
#----------------------------------------------------------------------------

20
demo/Throbber.py
View File

@@ -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 )

12
demo/TimeCtrl.py
View File

@@ -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) )

2
demo/agw/BalloonTip.py
View File

@@ -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)

16
demo/agw/CustomTreeCtrl.py
View File

@@ -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)

2
demo/agw/GenericMessageDialog.py
View File

@@ -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)

14
demo/agw/GradientButton.py
View File

@@ -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)

16
demo/agw/HyperTreeList.py
View File

@@ -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)

8
demo/agw/PyGauge.py
View File

@@ -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)

46
demo/agw/SuperToolTip.py
View File

@@ -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)

4
demo/agw/ThumbnailCtrl.py
View File

@@ -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)

8
demo/agw/ZoomBar.py
View File

@@ -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)

2
wx/lib/agw/cubecolourdialog.py
View File

@@ -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)

4
wx/lib/agw/multidirdialog.py
View File

@@ -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

2
wx/lib/agw/shortcuteditor.py
View File

@@ -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

2
wx/lib/itemspicker.py
View File

@@ -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