From d0363d3d2d959f8ad86177de9179a284206ee615 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Wed, 26 Apr 2006 16:27:20 +0000 Subject: [PATCH] make pen/brush parameters const git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/include/wx/fl/rowdragpl.h | 8 ++++---- contrib/include/wx/gizmos/multicell.h | 2 +- contrib/src/fl/rowdragpl.cpp | 8 ++++---- contrib/src/gizmos/multicell.cpp | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contrib/include/wx/fl/rowdragpl.h b/contrib/include/wx/fl/rowdragpl.h index a7eb36f65a..4e57159d9d 100644 --- a/contrib/include/wx/fl/rowdragpl.h +++ b/contrib/include/wx/fl/rowdragpl.h @@ -126,17 +126,17 @@ protected: virtual void DrawRombShades( wxPoint& p1, wxPoint& p2, wxPoint& p3, wxPoint& p4, wxDC& dc ); // Implements 'hard-coded metafile' for Netscape Navigator look. - virtual void DrawOrtoRomb( wxRect& inRect, wxDC& dc, wxBrush& bkBrush ); + virtual void DrawOrtoRomb( wxRect& inRect, wxDC& dc, const wxBrush& bkBrush ); // Implements 'hard-coded metafile' for Netscape Navigator look. - virtual void DrawRomb( wxRect& inRect, wxDC& dc, wxBrush& bkBrush ); + virtual void DrawRomb( wxRect& inRect, wxDC& dc, const wxBrush& bkBrush ); // Implements 'hard-coded metafile' for Netscape Navigator look. - virtual void Draw3DRect( wxRect& inRect, wxDC& dc, wxBrush& bkBrush ); + virtual void Draw3DRect( wxRect& inRect, wxDC& dc, const wxBrush& bkBrush ); // Implements 'hard-coded metafile' for Netscape Navigator look. virtual void DrawRectShade( wxRect& inRect, wxDC& dc, - int level, wxPen& upperPen, wxPen& lowerPen ); + int level, const wxPen& upperPen, const wxPen& lowerPen ); // Helper for drag and drop. virtual void GetRowHintRect( cbRowInfo* pRow, wxRect& rect ); diff --git a/contrib/include/wx/gizmos/multicell.h b/contrib/include/wx/gizmos/multicell.h index 534e6a4d15..decffefbe9 100644 --- a/contrib/include/wx/gizmos/multicell.h +++ b/contrib/include/wx/gizmos/multicell.h @@ -96,7 +96,7 @@ public: bool SetColumnWidth(int column, int colSize = 5, bool expandable = false); bool SetRowHeight(int row, int rowSize = 5, bool expandable = false); bool EnableGridLines(wxWindow *win); - bool SetGridPen(wxPen *pen); + bool SetGridPen(const wxPen *pen); void OnPaint(wxDC& dc); private: diff --git a/contrib/src/fl/rowdragpl.cpp b/contrib/src/fl/rowdragpl.cpp index 7e3eb29df3..e2f4d478c1 100644 --- a/contrib/src/fl/rowdragpl.cpp +++ b/contrib/src/fl/rowdragpl.cpp @@ -1044,7 +1044,7 @@ void cbRowDragPlugin::DrawRombShades( wxPoint& p1, wxPoint& p2, dc.DrawLine( p4.x, p4.y, p1.x, p1.y ); } -void cbRowDragPlugin::DrawOrtoRomb( wxRect& inRect, wxDC& dc, wxBrush& bkBrush ) +void cbRowDragPlugin::DrawOrtoRomb( wxRect& inRect, wxDC& dc, const wxBrush& bkBrush ) { dc.SetBrush( bkBrush ); dc.SetPen( mpLayout->mBlackPen ); @@ -1105,7 +1105,7 @@ void cbRowDragPlugin::DrawOrtoRomb( wxRect& inRect, wxDC& dc, wxBrush& bkBrush ) dc.SetBrush( wxNullBrush ); } -void cbRowDragPlugin::DrawRomb( wxRect& inRect, wxDC& dc, wxBrush& bkBrush ) +void cbRowDragPlugin::DrawRomb( wxRect& inRect, wxDC& dc, const wxBrush& bkBrush ) { wxPoint points[4]; @@ -1167,7 +1167,7 @@ void cbRowDragPlugin::DrawRomb( wxRect& inRect, wxDC& dc, wxBrush& bkBrush ) } void cbRowDragPlugin::DrawRectShade( wxRect& inRect, wxDC& dc, - int level, wxPen& upperPen, wxPen& lowerPen ) + int level, const wxPen& upperPen, const wxPen& lowerPen ) { // upper shade dc.SetPen( upperPen ); @@ -1192,7 +1192,7 @@ void cbRowDragPlugin::DrawRectShade( wxRect& inRect, wxDC& dc, dc.SetBrush( wxNullBrush ); } -void cbRowDragPlugin::Draw3DRect( wxRect& inRect, wxDC& dc, wxBrush& bkBrush ) +void cbRowDragPlugin::Draw3DRect( wxRect& inRect, wxDC& dc, const wxBrush& bkBrush ) { dc.SetPen( mpLayout->mNullPen ); dc.SetBrush( bkBrush ); diff --git a/contrib/src/gizmos/multicell.cpp b/contrib/src/gizmos/multicell.cpp index 07f88faa17..05221dbe97 100644 --- a/contrib/src/gizmos/multicell.cpp +++ b/contrib/src/gizmos/multicell.cpp @@ -198,7 +198,7 @@ bool wxMultiCellSizer::EnableGridLines(wxWindow *win) return true; } //--------------------------------------------------------------------------- -bool wxMultiCellSizer::SetGridPen(wxPen *pen) +bool wxMultiCellSizer::SetGridPen(const wxPen *pen) { m_pen = pen; return true; -- 2.45.2