Use Get*Box instead Get*Region if you are asking about position and size. And it is enough to have it in base class only.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -686,10 +686,13 @@ protected:
|
|||||||
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
|
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
|
||||||
wxCoord width, wxCoord height) = 0;
|
wxCoord width, wxCoord height) = 0;
|
||||||
|
|
||||||
// FIXME are these functions really different?
|
#if WXWIN_COMPATIBILITY_2_4
|
||||||
|
// this was only for confusing people, use DoGetClippingBox only
|
||||||
virtual void DoGetClippingRegion(wxCoord *x, wxCoord *y,
|
virtual void DoGetClippingRegion(wxCoord *x, wxCoord *y,
|
||||||
wxCoord *w, wxCoord *h)
|
wxCoord *w, wxCoord *h)
|
||||||
{ DoGetClippingBox(x, y, w, h); }
|
{ DoGetClippingBox(x, y, w, h); }
|
||||||
|
#endif
|
||||||
|
|
||||||
virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
|
virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
|
||||||
wxCoord *w, wxCoord *h) const
|
wxCoord *w, wxCoord *h) const
|
||||||
{
|
{
|
||||||
|
@@ -231,11 +231,6 @@ protected:
|
|||||||
virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
|
virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
|
||||||
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
|
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
|
||||||
wxCoord width, wxCoord height);
|
wxCoord width, wxCoord height);
|
||||||
virtual void DoGetClippingRegion(wxCoord *x, wxCoord *y,
|
|
||||||
wxCoord *width, wxCoord *height)
|
|
||||||
{
|
|
||||||
GetClippingBox(x, y, width, height);
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void DoGetSizeMM(int* width, int* height) const;
|
virtual void DoGetSizeMM(int* width, int* height) const;
|
||||||
|
|
||||||
|
@@ -231,11 +231,6 @@ protected:
|
|||||||
virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
|
virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
|
||||||
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
|
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
|
||||||
wxCoord width, wxCoord height);
|
wxCoord width, wxCoord height);
|
||||||
virtual void DoGetClippingRegion(wxCoord *x, wxCoord *y,
|
|
||||||
wxCoord *width, wxCoord *height)
|
|
||||||
{
|
|
||||||
GetClippingBox(x, y, width, height);
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void DoGetSizeMM(int* width, int* height) const;
|
virtual void DoGetSizeMM(int* width, int* height) const;
|
||||||
|
|
||||||
|
@@ -207,11 +207,6 @@ protected:
|
|||||||
virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
|
virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
|
||||||
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
|
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
|
||||||
wxCoord width, wxCoord height);
|
wxCoord width, wxCoord height);
|
||||||
virtual void DoGetClippingRegion(wxCoord *x, wxCoord *y,
|
|
||||||
wxCoord *width, wxCoord *height)
|
|
||||||
{
|
|
||||||
GetClippingBox(x, y, width, height);
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void DoGetSize(int *width, int *height) const;
|
virtual void DoGetSize(int *width, int *height) const;
|
||||||
virtual void DoGetSizeMM(int* width, int* height) const;
|
virtual void DoGetSizeMM(int* width, int* height) const;
|
||||||
|
@@ -183,11 +183,6 @@ protected:
|
|||||||
virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
|
virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
|
||||||
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
|
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
|
||||||
wxCoord width, wxCoord height);
|
wxCoord width, wxCoord height);
|
||||||
virtual void DoGetClippingRegion(wxCoord *x, wxCoord *y,
|
|
||||||
wxCoord *width, wxCoord *height)
|
|
||||||
{
|
|
||||||
GetClippingBox(x, y, width, height);
|
|
||||||
}
|
|
||||||
virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
|
virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
|
||||||
wxCoord *w, wxCoord *h) const;
|
wxCoord *w, wxCoord *h) const;
|
||||||
|
|
||||||
|
@@ -300,17 +300,6 @@ protected:
|
|||||||
,wxCoord vWidth
|
,wxCoord vWidth
|
||||||
,wxCoord vHeight
|
,wxCoord vHeight
|
||||||
);
|
);
|
||||||
virtual void DoGetClippingRegion( wxCoord* pX
|
|
||||||
,wxCoord* pY
|
|
||||||
,wxCoord* pWidth
|
|
||||||
,wxCoord* pHeight)
|
|
||||||
{
|
|
||||||
GetClippingBox( pX
|
|
||||||
,pY
|
|
||||||
,pWidth
|
|
||||||
,pHeight
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void DoGetSize( int* pWidth
|
virtual void DoGetSize( int* pWidth
|
||||||
,int* pHeight
|
,int* pHeight
|
||||||
|
@@ -184,11 +184,6 @@ protected:
|
|||||||
virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
|
virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
|
||||||
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
|
virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
|
||||||
wxCoord width, wxCoord height);
|
wxCoord width, wxCoord height);
|
||||||
virtual void DoGetClippingRegion(wxCoord *x, wxCoord *y,
|
|
||||||
wxCoord *width, wxCoord *height)
|
|
||||||
{
|
|
||||||
GetClippingBox(x, y, width, height);
|
|
||||||
}
|
|
||||||
virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
|
virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
|
||||||
wxCoord *w, wxCoord *h) const;
|
wxCoord *w, wxCoord *h) const;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user