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,