X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55c91e8a3faff8a1f4e758bbb64c28d1743c66c8..e56f4f9e90696fed39677c3410cb18562dcf0ad2:/contrib/src/ogl/lines.cpp diff --git a/contrib/src/ogl/lines.cpp b/contrib/src/ogl/lines.cpp index 5db7a49046..f875a404b5 100644 --- a/contrib/src/ogl/lines.cpp +++ b/contrib/src/ogl/lines.cpp @@ -9,11 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "lines.h" -#pragma implementation "linesp.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -22,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 @@ -842,7 +837,7 @@ 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 wxBrush *old_brush = m_brush; wxPen bg_pen = GetBackgroundPen(); wxBrush bg_brush = GetBackgroundBrush(); SetPen(&bg_pen); @@ -963,7 +958,7 @@ 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 wxBrush *old_brush = m_brush; wxPen dottedPen(*wxBLACK, 1, wxDOT); SetPen(& dottedPen); @@ -1747,7 +1742,7 @@ void wxLineShape::OnSizingDragLeft(wxControlPoint* pt, bool WXUNUSED(draw), doub wxLineShape *lineShape = (wxLineShape *)this; wxPen *old_pen = lineShape->GetPen(); - wxBrush *old_brush = lineShape->GetBrush(); + const wxBrush *old_brush = lineShape->GetBrush(); wxPen dottedPen(*wxBLACK, 1, wxDOT); lineShape->SetPen(& dottedPen); @@ -1795,7 +1790,7 @@ void wxLineShape::OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, lpt->m_point->x = x; lpt->m_point->y = y; wxPen *old_pen = lineShape->GetPen(); - wxBrush *old_brush = lineShape->GetBrush(); + const wxBrush *old_brush = lineShape->GetBrush(); wxPen dottedPen(*wxBLACK, 1, wxDOT); lineShape->SetPen(& dottedPen); @@ -2508,4 +2503,3 @@ void wxLabelShape::OnRightClick(double x, double y, int keys, int attachment) { m_lineShape->GetEventHandler()->OnRightClick(x, y, keys, attachment); } -