don't deprecate the entire wxDrawObject class, this results in warnings when we just...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dc.h b/include/wx/dc.h
index ccc92236e73dc759fe04a9f06fbec5c9407c4d82..1fd9da829b5c1a2912131772ba6f074df75cffa7 100644 (file)
--- 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 6dc769fe8ba218be5b746ca1fcbbd02280910d29..1742bf8dadf501062060326c5f9ef153588d4b10 100644 (file)
--- 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
 
 /*