From d41d15957672b27f1e441ab4f050e4e07a9cecc8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 1 Apr 2020 22:33:02 +0200 Subject: [PATCH] Replace wxGridCellBoolRenderer::ms_sizeCheckMark with a local var This variable is (now) only used in a single function, so there is no reason to declare it as a class member. No real changes. --- include/wx/generic/gridctrl.h | 3 --- src/generic/gridctrl.cpp | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/wx/generic/gridctrl.h b/include/wx/generic/gridctrl.h index 28249fae88..c06937f0b2 100644 --- a/include/wx/generic/gridctrl.h +++ b/include/wx/generic/gridctrl.h @@ -143,9 +143,6 @@ public: virtual wxGridCellRenderer *Clone() const wxOVERRIDE { return new wxGridCellBoolRenderer; } - -private: - static wxSize ms_sizeCheckMark; }; diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp index 0d04d89e34..96d13b9f15 100644 --- a/src/generic/gridctrl.cpp +++ b/src/generic/gridctrl.cpp @@ -920,22 +920,22 @@ void wxGridCellFloatRenderer::SetParameters(const wxString& params) // wxGridCellBoolRenderer // ---------------------------------------------------------------------------- -wxSize wxGridCellBoolRenderer::ms_sizeCheckMark; - wxSize wxGridCellBoolRenderer::GetBestSize(wxGrid& grid, wxGridCellAttr& WXUNUSED(attr), wxDC& WXUNUSED(dc), int WXUNUSED(row), int WXUNUSED(col)) { + static wxSize s_sizeCheckMark; + // compute it only once (no locks for MT safeness in GUI thread...) - if ( !ms_sizeCheckMark.x ) + if ( !s_sizeCheckMark.x ) { - ms_sizeCheckMark = + s_sizeCheckMark = wxRendererNative::Get().GetCheckBoxSize(&grid, wxCONTROL_CELL); } - return ms_sizeCheckMark; + return s_sizeCheckMark; } void wxGridCellBoolRenderer::Draw(wxGrid& grid,