diff --git a/include/wx/dc.h b/include/wx/dc.h index ccc92236e7..1fd9da829b 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -125,10 +125,10 @@ enum wxMappingMode // wxDrawObject helper class //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxDEPRECATED_BUT_USED_INTERNALLY(wxDrawObject) +class WXDLLIMPEXP_CORE wxDrawObject { public: - wxDrawObject() + wxDEPRECATED_CONSTRUCTOR(wxDrawObject)() : m_isBBoxValid(false) , m_minX(0), m_minY(0), m_maxX(0), m_maxY(0) { } @@ -1197,12 +1197,7 @@ public: wxDEPRECATED( void GetDeviceOrigin(long *x, long *y) const ); wxDEPRECATED( void GetClippingBox(long *x, long *y, long *w, long *h) const ); - void DrawObject(wxDrawObject* drawobject) - { - drawobject->Draw(*this); - CalcBoundingBox(drawobject->MinX(),drawobject->MinY()); - CalcBoundingBox(drawobject->MaxX(),drawobject->MaxY()); - } + wxDEPRECATED( void DrawObject(wxDrawObject* drawobject) ); #endif // WXWIN_COMPATIBILITY_2_8 #ifdef __WXMSW__ diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp index 6dc769fe8b..1742bf8dad 100644 --- a/src/common/dcbase.cpp +++ b/src/common/dcbase.cpp @@ -1332,6 +1332,13 @@ void wxDC::GetClippingBox(long *x, long *y, long *w, long *h) const if (h) *h = hh; } +void wxDC::DrawObject(wxDrawObject* drawobject) +{ + drawobject->Draw(*this); + CalcBoundingBox(drawobject->MinX(),drawobject->MinY()); + CalcBoundingBox(drawobject->MaxX(),drawobject->MaxY()); +} + #endif // WXWIN_COMPATIBILITY_2_8 /*