diff --git a/demo/ArtProvider.py b/demo/ArtProvider.py index 8e5f7f7e..b890894e 100644 --- a/demo/ArtProvider.py +++ b/demo/ArtProvider.py @@ -69,6 +69,8 @@ ArtIDs = [ "wx.ART_ADD_BOOKMARK", "wx.ART_QUIT", "wx.ART_FIND", "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) 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) diff --git a/demo/Dialog.py b/demo/Dialog.py index 2e12519f..b9007065 100644 --- a/demo/Dialog.py +++ b/demo/Dialog.py @@ -42,7 +42,7 @@ class TestDialog(wx.Dialog): text.SetHelpText("Here's some help text for field #1") 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) @@ -54,10 +54,10 @@ class TestDialog(wx.Dialog): text.SetHelpText("Here's some help text for field #2") 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) - 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() @@ -75,7 +75,7 @@ class TestDialog(wx.Dialog): btnsizer.AddButton(btn) btnsizer.Realize() - sizer.Add(btnsizer, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + sizer.Add(btnsizer, 0, wx.ALL, 5) self.SetSizer(sizer) sizer.Fit(self) diff --git a/demo/Main.py b/demo/Main.py index f8c737d1..be727e4f 100644 --- a/demo/Main.py +++ b/demo/Main.py @@ -1243,7 +1243,7 @@ class DemoErrorPanel(wx.Panel): self.list.SetColumnWidth(2, wx.LIST_AUTOSIZE) self.box.Add(wx.StaticText(self, -1, "Traceback:") , 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" + "Double-click on them to go to the offending line") , 0, wx.ALIGN_CENTER | wx.BOTTOM, 5)