Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-04 11:00:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sizers now assert if there is an alignment flag used with wx.EXPAND

Browse Source
This commit is contained in:
Robin Dunn
2018-02-10 12:53:48 -08:00
parent c4b741b797
commit 32e1341df2
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
demo/ArtProvider.py
View File

@@ -69,6 +69,8 @@ ArtIDs = [ "wx.ART_ADD_BOOKMARK",
"wx.ART_QUIT", "wx.ART_QUIT",
"wx.ART_FIND", "wx.ART_FIND",
"wx.ART_FIND_AND_REPLACE", "wx.ART_FIND_AND_REPLACE",
"wx.ART_FULL_SCREEN",
"wx.ART_EDIT",
] ]
@@ -132,7 +134,7 @@ class TestPanel(wx.Panel):
sizer.Add(title, 0, wx.ALIGN_CENTRE|wx.ALL, 5) sizer.Add(title, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL) 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.EXPAND|wx.ALL, 5)
fgs = wx.FlexGridSizer(cols=3, hgap=10, vgap=10) fgs = wx.FlexGridSizer(cols=3, hgap=10, vgap=10)

8
demo/Dialog.py
View File

@@ -42,7 +42,7 @@ class TestDialog(wx.Dialog):
text.SetHelpText("Here's some help text for field #1") text.SetHelpText("Here's some help text for field #1")
box.Add(text, 1, wx.ALIGN_CENTRE|wx.ALL, 5) box.Add(text, 1, wx.ALIGN_CENTRE|wx.ALL, 5)
sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) sizer.Add(box, 0, wx.EXPAND|wx.ALL, 5)
box = wx.BoxSizer(wx.HORIZONTAL) box = wx.BoxSizer(wx.HORIZONTAL)
@@ -54,10 +54,10 @@ class TestDialog(wx.Dialog):
text.SetHelpText("Here's some help text for field #2") text.SetHelpText("Here's some help text for field #2")
box.Add(text, 1, wx.ALIGN_CENTRE|wx.ALL, 5) box.Add(text, 1, wx.ALIGN_CENTRE|wx.ALL, 5)
sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) sizer.Add(box, 0, wx.EXPAND|wx.ALL, 5)
line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL) line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL)
sizer.Add(line, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.RIGHT|wx.TOP, 5) sizer.Add(line, 0, wx.EXPAND|wx.RIGHT|wx.TOP, 5)
btnsizer = wx.StdDialogButtonSizer() btnsizer = wx.StdDialogButtonSizer()
@@ -75,7 +75,7 @@ class TestDialog(wx.Dialog):
btnsizer.AddButton(btn) btnsizer.AddButton(btn)
btnsizer.Realize() btnsizer.Realize()
sizer.Add(btnsizer, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) sizer.Add(btnsizer, 0, wx.ALL, 5)
self.SetSizer(sizer) self.SetSizer(sizer)
sizer.Fit(self) sizer.Fit(self)

2
demo/Main.py
View File

@@ -1243,7 +1243,7 @@ class DemoErrorPanel(wx.Panel):
self.list.SetColumnWidth(2, wx.LIST_AUTOSIZE) self.list.SetColumnWidth(2, wx.LIST_AUTOSIZE)
self.box.Add(wx.StaticText(self, -1, "Traceback:") self.box.Add(wx.StaticText(self, -1, "Traceback:")
, 0, wx.ALIGN_CENTER | wx.TOP, 5) , 0, wx.ALIGN_CENTER | wx.TOP, 5)
self.box.Add(self.list, 1, wx.GROW | wx.ALIGN_CENTER | wx.ALL, 5) self.box.Add(self.list, 1, wx.EXPAND | wx.ALL, 5)
self.box.Add(wx.StaticText(self, -1, "Entries from the demo module are shown in blue\n" self.box.Add(wx.StaticText(self, -1, "Entries from the demo module are shown in blue\n"
+ "Double-click on them to go to the offending line") + "Double-click on them to go to the offending line")
, 0, wx.ALIGN_CENTER | wx.BOTTOM, 5) , 0, wx.ALIGN_CENTER | wx.BOTTOM, 5)