From 7924b3b48d738c59ae2266456a56ed070ee1560a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 31 May 2019 21:21:06 -0700 Subject: [PATCH] A few fixes from Jorge Moraleda --- demo/PDFViewer.py | 5 ++--- wx/lib/agw/buttonpanel.py | 2 +- wx/lib/pdfviewer/viewer.py | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/PDFViewer.py b/demo/PDFViewer.py index e77d1aaf..633a7b20 100644 --- a/demo/PDFViewer.py +++ b/demo/PDFViewer.py @@ -17,15 +17,14 @@ class TestPanel(wx.Panel): vsizer = wx.BoxSizer( wx.VERTICAL ) self.buttonpanel = pdfButtonPanel(self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, 0) - vsizer.Add(self.buttonpanel, 0, - wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.LEFT|wx.RIGHT|wx.TOP, 5) + vsizer.Add(self.buttonpanel, 0, wx.GROW|wx.LEFT|wx.RIGHT|wx.TOP, 5) self.viewer = pdfViewer( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.HSCROLL|wx.VSCROLL|wx.SUNKEN_BORDER) vsizer.Add(self.viewer, 1, wx.GROW|wx.LEFT|wx.RIGHT|wx.BOTTOM, 5) loadbutton = wx.Button(self, wx.ID_ANY, "Load PDF file", wx.DefaultPosition, wx.DefaultSize, 0 ) vsizer.Add(loadbutton, 0, wx.ALIGN_CENTER|wx.ALL, 5) - hsizer.Add(vsizer, 1, wx.GROW|wx.ALIGN_CENTER_HORIZONTAL|wx.ALL, 5) + hsizer.Add(vsizer, 1, wx.GROW|wx.ALL, 5) self.SetSizer(hsizer) self.SetAutoLayout(True) diff --git a/wx/lib/agw/buttonpanel.py b/wx/lib/agw/buttonpanel.py index 7017c8ff..4f45e9d0 100644 --- a/wx/lib/agw/buttonpanel.py +++ b/wx/lib/agw/buttonpanel.py @@ -1931,7 +1931,7 @@ class ButtonPanel(wx.Panel): """ lenChildren = len(self._mainsizer.GetChildren()) - self._mainsizer.Insert(lenChildren-1, btnInfo, 0, wx.ALIGN_CENTER|wx.EXPAND, userData=btnInfo) + self._mainsizer.Insert(lenChildren-1, btnInfo, 0, wx.ALIGN_CENTER, userData=btnInfo) self._vButtons.append(btnInfo) diff --git a/wx/lib/pdfviewer/viewer.py b/wx/lib/pdfviewer/viewer.py index 7a1e112e..7b75724b 100644 --- a/wx/lib/pdfviewer/viewer.py +++ b/wx/lib/pdfviewer/viewer.py @@ -145,6 +145,7 @@ class pdfViewer(wx.ScrolledWindow): Redraw on resize. """ if self.resizing: + self.page_buffer_valid = False self.Render() self.resizing = False event.Skip()