added template wxScopedArray<> too

[wxWidgets.git] / include / wx / dc.h

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 2357fb12e5cbd68fef16683645860b20de8395c6..1fd9da829b5c1a2912131772ba6f074df75cffa7 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -61,7 +61,7 @@ enum wxRasterOperationMode
     wxNAND,        // (NOT src) OR (NOT dst)
     wxOR,          // src OR dst
     wxSET          // 1
-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8
     ,wxROP_BLACK = wxCLEAR,
     wxBLIT_BLACKNESS = wxCLEAR,
     wxROP_XORPEN = wxXOR,
@@ -119,6 +119,8 @@ enum wxMappingMode
     wxMM_METRIC
 };
 
+#if WXWIN_COMPATIBILITY_2_8
+
 //-----------------------------------------------------------------------------
 // wxDrawObject helper class
 //-----------------------------------------------------------------------------
@@ -126,8 +128,7 @@ enum wxMappingMode
 class WXDLLIMPEXP_CORE wxDrawObject
 {
 public:
-
-    wxDrawObject()
+    wxDEPRECATED_CONSTRUCTOR(wxDrawObject)()
         : m_isBBoxValid(false)
         , m_minX(0), m_minY(0), m_maxX(0), m_maxY(0)
     { }
@@ -180,6 +181,8 @@ protected:
     wxCoord m_minX, m_minY, m_maxX, m_maxY;
 };
 
+#endif // WXWIN_COMPATIBILITY_2_8
+
 
 //-----------------------------------------------------------------------------
 // wxDCFactory
@@ -963,15 +966,6 @@ public:
         { m_pimpl->SetDeviceLocalOrigin( x, y ); }
 
 
-    // draw generic object
-
-    void DrawObject(wxDrawObject* drawobject)
-    {
-        drawobject->Draw(*this);
-        CalcBoundingBox(drawobject->MinX(),drawobject->MinY());
-        CalcBoundingBox(drawobject->MaxX(),drawobject->MaxY());
-    }
-
     // -----------------------------------------------
     // the actual drawing API
 
@@ -1203,6 +1197,7 @@ public:
     wxDEPRECATED( void GetDeviceOrigin(long *x, long *y) const );
     wxDEPRECATED( void GetClippingBox(long *x, long *y, long *w, long *h) const );
 
+    wxDEPRECATED( void DrawObject(wxDrawObject* drawobject) );
 #endif  // WXWIN_COMPATIBILITY_2_8
 
 #ifdef __WXMSW__