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

fix warnings about calling an inline function before it is defined inline

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-10-10 07:10:54 +00:00
parent 12f72836af
commit 8e7cb70ce3
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/wx/region.h
View File

@@ -142,23 +142,20 @@ public:
#endif // wxUSE_IMAGE #endif // wxUSE_IMAGE
// Intersect rectangle or region with this one. // Intersect rectangle or region with this one.
bool Intersect(wxCoord x, wxCoord y, wxCoord w, wxCoord h) bool Intersect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
{ return Intersect(wxRect(x, y, w, h)); }
bool Intersect(const wxRect& rect); bool Intersect(const wxRect& rect);
bool Intersect(const wxRegion& region) bool Intersect(const wxRegion& region)
{ return DoIntersect(region); } { return DoIntersect(region); }
// Subtract rectangle or region from this: // Subtract rectangle or region from this:
// Combines the parts of 'this' that are not part of the second region. // Combines the parts of 'this' that are not part of the second region.
bool Subtract(wxCoord x, wxCoord y, wxCoord w, wxCoord h) bool Subtract(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
{ return Subtract(wxRect(x, y, w, h)); }
bool Subtract(const wxRect& rect); bool Subtract(const wxRect& rect);
bool Subtract(const wxRegion& region) bool Subtract(const wxRegion& region)
{ return DoSubtract(region); } { return DoSubtract(region); }
// XOR: the union of two combined regions except for any overlapping areas. // XOR: the union of two combined regions except for any overlapping areas.
bool Xor(wxCoord x, wxCoord y, wxCoord w, wxCoord h) bool Xor(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
{ return Xor(wxRect(x, y, w, h)); }
bool Xor(const wxRect& rect); bool Xor(const wxRect& rect);
bool Xor(const wxRegion& region) bool Xor(const wxRegion& region)
{ return DoXor(region); } { return DoXor(region); }
@@ -270,6 +267,24 @@ inline bool wxRegionBase::Xor(const wxRect& rect)
return DoXor(wxRegion(rect)); return DoXor(wxRegion(rect));
} }
// ...and these functions are here because they call the ones above, and its
// not really proper to call an inline function before its defined inline.
inline bool wxRegionBase::Intersect(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
{
return Intersect(wxRect(x, y, w, h));
}
inline bool wxRegionBase::Subtract(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
{
return Subtract(wxRect(x, y, w, h));
}
inline bool wxRegionBase::Xor(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
{
return Xor(wxRect(x, y, w, h));
}
#ifdef wxHAS_REGION_COMBINE #ifdef wxHAS_REGION_COMBINE
inline bool wxRegionWithCombine::Combine(wxCoord x, inline bool wxRegionWithCombine::Combine(wxCoord x,