From 40f8595a0c828631255c0053613bc2b0114eb080 Mon Sep 17 00:00:00 2001 From: Jorge Moraleda Date: Sun, 9 Jul 2023 21:50:38 -0400 Subject: [PATCH] Add support for frozen rows and columns to GridWithLabelRenderersMixin --- wx/lib/mixins/gridlabelrenderer.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/wx/lib/mixins/gridlabelrenderer.py b/wx/lib/mixins/gridlabelrenderer.py index ee9dfb5f..8fa569cd 100644 --- a/wx/lib/mixins/gridlabelrenderer.py +++ b/wx/lib/mixins/gridlabelrenderer.py @@ -95,12 +95,14 @@ class GridWithLabelRenderersMixin(object): def _onPaintRowLabels(self, evt): window = evt.GetEventObject() dc = wx.PaintDC(window) + gridWindow = self.GetGridWindow() - rows = self.CalcRowLabelsExposed(window.GetUpdateRegion()) + rows = self.CalcRowLabelsExposed(window.GetUpdateRegion(), gridWindow) if rows == [-1]: return - x, y = self.CalcUnscrolledPosition((0,0)) + offset = self.GetGridWindowOffset(gridWindow) + x, y = self.CalcUnscrolledPosition(offset) pt = dc.GetDeviceOrigin() dc.SetDeviceOrigin(pt.x, pt.y-y) for row in rows: @@ -119,12 +121,14 @@ class GridWithLabelRenderersMixin(object): def _onPaintColLabels(self, evt): window = evt.GetEventObject() dc = wx.PaintDC(window) + gridWindow = self.GetGridWindow() - cols = self.CalcColLabelsExposed(window.GetUpdateRegion()) + cols = self.CalcColLabelsExposed(window.GetUpdateRegion(), gridWindow) if cols == [-1]: return - x, y = self.CalcUnscrolledPosition((0,0)) + offset = self.GetGridWindowOffset(gridWindow) + x, y = self.CalcUnscrolledPosition(offset) pt = dc.GetDeviceOrigin() dc.SetDeviceOrigin(pt.x-x, pt.y) for col in cols: