From fca4ef0458c6a49aa1942777dadd14384e78d3dc Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sun, 25 Aug 2019 20:53:33 -0700 Subject: [PATCH] Use wxDC rather than wxClientDC for parameter type --- include/wx/propgrid/propgridpagestate.h | 6 ++---- src/propgrid/propgridpagestate.cpp | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/wx/propgrid/propgridpagestate.h b/include/wx/propgrid/propgridpagestate.h index f62a058061..e2b2777eef 100644 --- a/include/wx/propgrid/propgridpagestate.h +++ b/include/wx/propgrid/propgridpagestate.h @@ -17,8 +17,6 @@ #include "wx/propgrid/property.h" -class WXDLLIMPEXP_FWD_CORE wxClientDC; - // ----------------------------------------------------------------------- // A return value from wxPropertyGrid::HitTest(), @@ -471,12 +469,12 @@ public: // Returns minimal width for given column so that all images and texts // will fit entirely. // Used by SetSplitterLeft() and DoFitColumns(). - int GetColumnFitWidth(wxClientDC& dc, + int GetColumnFitWidth(const wxDC& dc, wxPGProperty* pwc, unsigned int col, bool subProps) const; - int GetColumnFullWidth(wxClientDC &dc, wxPGProperty *p, unsigned int col); + int GetColumnFullWidth(const wxDC& dc, wxPGProperty* p, unsigned int col); // Returns information about arbitrary position in the grid. // pt - Logical coordinates in the virtual grid space. Use diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp index c9bad30454..f25f966404 100644 --- a/src/propgrid/propgridpagestate.cpp +++ b/src/propgrid/propgridpagestate.cpp @@ -718,7 +718,7 @@ wxPropertyGridPageState::HitTest( const wxPoint&pt ) const // ----------------------------------------------------------------------- // Used by SetSplitterLeft() and DotFitColumns() -int wxPropertyGridPageState::GetColumnFitWidth(wxClientDC& dc, +int wxPropertyGridPageState::GetColumnFitWidth(const wxDC& dc, wxPGProperty* pwc, unsigned int col, bool subProps) const @@ -762,7 +762,7 @@ int wxPropertyGridPageState::GetColumnFitWidth(wxClientDC& dc, return maxW; } -int wxPropertyGridPageState::GetColumnFullWidth( wxClientDC &dc, wxPGProperty *p, unsigned int col ) +int wxPropertyGridPageState::GetColumnFullWidth(const wxDC& dc, wxPGProperty* p, unsigned int col) { if ( p->IsCategory() ) return 0;