Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deprecate wxDrawObject (#9860)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-25 11:32:41 +00:00
parent 215bd0e12b
commit 0a0e498415
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/dc.h
View File

@@ -119,14 +119,15 @@ enum wxMappingMode
wxMM_METRIC wxMM_METRIC
}; };
#if WXWIN_COMPATIBILITY_2_8
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxDrawObject helper class // wxDrawObject helper class
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxDrawObject class WXDLLIMPEXP_CORE wxDEPRECATED_BUT_USED_INTERNALLY(wxDrawObject)
{ {
public: public:
wxDrawObject() wxDrawObject()
: m_isBBoxValid(false) : m_isBBoxValid(false)
, m_minX(0), m_minY(0), m_maxX(0), m_maxY(0) , 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; wxCoord m_minX, m_minY, m_maxX, m_maxY;
}; };
#endif // WXWIN_COMPATIBILITY_2_8
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxDCFactory // wxDCFactory
@@ -963,15 +966,6 @@ public:
{ m_pimpl->SetDeviceLocalOrigin( x, y ); } { 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 // the actual drawing API
@@ -1203,6 +1197,12 @@ public:
wxDEPRECATED( void GetDeviceOrigin(long *x, long *y) const ); wxDEPRECATED( void GetDeviceOrigin(long *x, long *y) const );
wxDEPRECATED( void GetClippingBox(long *x, long *y, long *w, long *h) 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());
}
#endif // WXWIN_COMPATIBILITY_2_8 #endif // WXWIN_COMPATIBILITY_2_8
#ifdef __WXMSW__ #ifdef __WXMSW__