X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/44bf7fe3d043bfd096ee2218712154b5ab992504..8ad31f9dfdb85a54cd080aac6957883f2f3e38e3:/src/generic/regiong.cpp diff --git a/src/generic/regiong.cpp b/src/generic/regiong.cpp index 218f5a324c..c81364b059 100644 --- a/src/generic/regiong.cpp +++ b/src/generic/regiong.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: generic/region.cpp +// Name: src/generic/region.cpp // Purpose: generic wxRegion class // Author: David Elliott // Modified by: @@ -9,8 +9,19 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + #include "wx/generic/region.h" -#include "wx/utils.h" + +#ifndef WX_PRECOMP + #include "wx/utils.h" +#endif // ======================================================================== // Classes to interface with X.org code @@ -228,7 +239,7 @@ private: // ======================================================================== // wxRegionGeneric // ======================================================================== -//IMPLEMENT_DYNAMIC_CLASS(wxRegionGeneric, wxGDIObject); +//IMPLEMENT_DYNAMIC_CLASS(wxRegionGeneric, wxGDIObject) #define M_REGIONDATA ((wxRegionRefData *)m_refData) #define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData)) @@ -275,7 +286,7 @@ wxObjectRefData *wxRegionGeneric::CloneRefData(const wxObjectRefData *data) cons return new wxRegionRefData(*(wxRegionRefData *)data); } -bool wxRegionGeneric::operator== (const wxRegionGeneric& region) +bool wxRegionGeneric::operator== (const wxRegionGeneric& region) const { wxASSERT(m_refData && region.m_refData); return REGION::XEqualRegion(M_REGIONDATA,M_REGIONDATA_OF(region)); @@ -415,7 +426,7 @@ wxRegionContain wxRegionGeneric::Contains(const wxRect& rect) const // ======================================================================== // wxRegionIteratorGeneric // ======================================================================== -//IMPLEMENT_DYNAMIC_CLASS(wxRegionIteratorGeneric,wxObject); +//IMPLEMENT_DYNAMIC_CLASS(wxRegionIteratorGeneric,wxObject) wxRegionIteratorGeneric::wxRegionIteratorGeneric() { @@ -1953,4 +1964,3 @@ XRectInRegion( return(partIn ? ((ry < prect->y2) ? wxPartRegion : wxInRegion) : wxOutRegion); } -