Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxDC rather than wxClientDC for parameter type

Browse Source
This commit is contained in:
Paul Cornett
2019-08-25 20:53:33 -07:00
parent 3b54720b3a
commit fca4ef0458
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/propgrid/propgridpagestate.h
View File

@@ -17,8 +17,6 @@
#include "wx/propgrid/property.h" #include "wx/propgrid/property.h"
class WXDLLIMPEXP_FWD_CORE wxClientDC;
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// A return value from wxPropertyGrid::HitTest(), // A return value from wxPropertyGrid::HitTest(),
@@ -471,12 +469,12 @@ public:
// Returns minimal width for given column so that all images and texts // Returns minimal width for given column so that all images and texts
// will fit entirely. // will fit entirely.
// Used by SetSplitterLeft() and DoFitColumns(). // Used by SetSplitterLeft() and DoFitColumns().
int GetColumnFitWidth(wxClientDC& dc, int GetColumnFitWidth(const wxDC& dc,
wxPGProperty* pwc, wxPGProperty* pwc,
unsigned int col, unsigned int col,
bool subProps) const; 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. // Returns information about arbitrary position in the grid.
// pt - Logical coordinates in the virtual grid space. Use // pt - Logical coordinates in the virtual grid space. Use

4
src/propgrid/propgridpagestate.cpp
View File

@@ -718,7 +718,7 @@ wxPropertyGridPageState::HitTest( const wxPoint&pt ) const
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// Used by SetSplitterLeft() and DotFitColumns() // Used by SetSplitterLeft() and DotFitColumns()
int wxPropertyGridPageState::GetColumnFitWidth(wxClientDC& dc, int wxPropertyGridPageState::GetColumnFitWidth(const wxDC& dc,
wxPGProperty* pwc, wxPGProperty* pwc,
unsigned int col, unsigned int col,
bool subProps) const bool subProps) const
@@ -762,7 +762,7 @@ int wxPropertyGridPageState::GetColumnFitWidth(wxClientDC& dc,
return maxW; 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() ) if ( p->IsCategory() )
return 0; return 0;