X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..1215ec07d82d1b70402fe32293752f77d3d593fd:/contrib/src/ogl/lines.cpp diff --git a/contrib/src/ogl/lines.cpp b/contrib/src/ogl/lines.cpp index b8c81fb8ed..a5982157a0 100644 --- a/contrib/src/ogl/lines.cpp +++ b/contrib/src/ogl/lines.cpp @@ -17,11 +17,11 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #if wxUSE_PROLOGIO -#include +#include "wx/deprecated/wxexpr.h" #endif #ifdef new @@ -836,8 +836,8 @@ void wxLineShape::DrawArrow(wxDC& dc, wxArrowHead *arrow, double xOffset, bool p void wxLineShape::OnErase(wxDC& dc) { - wxPen *old_pen = m_pen; - wxBrush *old_brush = m_brush; + const wxPen *old_pen = m_pen; + const wxBrush *old_brush = m_brush; wxPen bg_pen = GetBackgroundPen(); wxBrush bg_brush = GetBackgroundBrush(); SetPen(&bg_pen); @@ -957,8 +957,8 @@ void wxLineShape::FindNth(wxShape *image, int *nth, int *no_arcs, bool incoming) void wxLineShape::OnDrawOutline(wxDC& dc, double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(w), double WXUNUSED(h)) { - wxPen *old_pen = m_pen; - wxBrush *old_brush = m_brush; + const wxPen *old_pen = m_pen; + const wxBrush *old_brush = m_brush; wxPen dottedPen(*wxBLACK, 1, wxDOT); SetPen(& dottedPen); @@ -1741,8 +1741,8 @@ void wxLineShape::OnSizingDragLeft(wxControlPoint* pt, bool WXUNUSED(draw), doub wxLineShape *lineShape = (wxLineShape *)this; - wxPen *old_pen = lineShape->GetPen(); - wxBrush *old_brush = lineShape->GetBrush(); + const wxPen *old_pen = lineShape->GetPen(); + const wxBrush *old_brush = lineShape->GetBrush(); wxPen dottedPen(*wxBLACK, 1, wxDOT); lineShape->SetPen(& dottedPen); @@ -1789,8 +1789,8 @@ void wxLineShape::OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, lpt->m_xpos = x; lpt->m_ypos = y; lpt->m_point->x = x; lpt->m_point->y = y; - wxPen *old_pen = lineShape->GetPen(); - wxBrush *old_brush = lineShape->GetBrush(); + const wxPen *old_pen = lineShape->GetPen(); + const wxBrush *old_brush = lineShape->GetBrush(); wxPen dottedPen(*wxBLACK, 1, wxDOT); lineShape->SetPen(& dottedPen); @@ -2503,4 +2503,3 @@ void wxLabelShape::OnRightClick(double x, double y, int keys, int attachment) { m_lineShape->GetEventHandler()->OnRightClick(x, y, keys, attachment); } -