From 0b7e77395dbcf179c60e69231634fdc89d739a29 Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Fri, 10 Mar 2000 22:07:01 +0000 Subject: [PATCH] Replaced long by wxCoord as used in the other ports. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/os2/region.h | 30 +++++++++++++++--------------- src/os2/region.cpp | 22 +++++++++++----------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h index f732b3b796..e524cc157e 100644 --- a/include/wx/os2/region.h +++ b/include/wx/os2/region.h @@ -36,7 +36,7 @@ class WXDLLEXPORT wxRegion : public wxGDIObject { DECLARE_DYNAMIC_CLASS(wxRegion); friend class WXDLLEXPORT wxRegionIterator; public: - wxRegion(long x, long y, long w, long h); + wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h); wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxRect& rect); wxRegion(WXHRGN hRegion); // Hangs on to this region @@ -55,29 +55,29 @@ public: void Clear(); // Union rectangle or region with this. - inline bool Union(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_OR); } + inline bool Union(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_OR); } inline bool Union(const wxRect& rect) { return Combine(rect, wxRGN_OR); } inline bool Union(const wxRegion& region) { return Combine(region, wxRGN_OR); } // Intersect rectangle or region with this. - inline bool Intersect(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_AND); } + inline bool Intersect(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_AND); } inline bool Intersect(const wxRect& rect) { return Combine(rect, wxRGN_AND); } inline bool Intersect(const wxRegion& region) { return Combine(region, wxRGN_AND); } // Subtract rectangle or region from this: // Combines the parts of 'this' that are not part of the second region. - inline bool Subtract(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_DIFF); } + inline bool Subtract(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_DIFF); } inline bool Subtract(const wxRect& rect) { return Combine(rect, wxRGN_DIFF); } inline bool Subtract(const wxRegion& region) { return Combine(region, wxRGN_DIFF); } // XOR: the union of two combined regions except for any overlapping areas. - inline bool Xor(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_XOR); } + inline bool Xor(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { return Combine(x, y, width, height, wxRGN_XOR); } inline bool Xor(const wxRect& rect) { return Combine(rect, wxRGN_XOR); } inline bool Xor(const wxRegion& region) { return Combine(region, wxRGN_XOR); } //# Information on region // Outer bounds of region - void GetBox(long& x, long& y, long&w, long &h) const; + void GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const; wxRect GetBox() const ; // Is region empty? @@ -86,16 +86,16 @@ public: //# Tests // Does the region contain the point (x,y)? - wxRegionContain Contains(long x, long y) const; + wxRegionContain Contains(wxCoord x, wxCoord y) const; // Does the region contain the point pt? wxRegionContain Contains(const wxPoint& pt) const; // Does the region contain the rectangle (x, y, w, h)? - wxRegionContain Contains(long x, long y, long w, long h) const; + wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const; // Does the region contain the rectangle rect? wxRegionContain Contains(const wxRect& rect) const; // Internal - bool Combine(long x, long y, long width, long height, wxRegionOp op); + bool Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op); bool Combine(const wxRegion& region, wxRegionOp op); bool Combine(const wxRect& rect, wxRegionOp op); @@ -119,12 +119,12 @@ public: void operator ++ (); void operator ++ (int); - long GetX() const; - long GetY() const; - long GetW() const; - long GetWidth() const { return GetW(); } - long GetH() const; - long GetHeight() const { return GetH(); } + wxCoord GetX() const; + wxCoord GetY() const; + wxCoord GetW() const; + wxCoord GetWidth() const { return GetW(); } + wxCoord GetH() const; + wxCoord GetHeight() const { return GetH(); } wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); } private: diff --git a/src/os2/region.cpp b/src/os2/region.cpp index c991f9c046..2ea5f9d684 100644 --- a/src/os2/region.cpp +++ b/src/os2/region.cpp @@ -67,7 +67,7 @@ wxRegion::wxRegion(WXHRGN hRegion) M_REGION = (HRGN) hRegion; } -wxRegion::wxRegion(long x, long y, long w, long h) +wxRegion::wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h) { m_refData = new wxRegionRefData; // TODO create rect region @@ -104,7 +104,7 @@ void wxRegion::Clear() } //! Combine rectangle (x, y, w, h) with this. -bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op) +bool wxRegion::Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op) { // Don't change shared data if (!m_refData) { @@ -195,7 +195,7 @@ bool wxRegion::Combine(const wxRect& rect, wxRegionOp op) //----------------------------------------------------------------------------- // Outer bounds of region -void wxRegion::GetBox(long& x, long& y, long&w, long &h) const +void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const { if (m_refData) { // TODO get box @@ -206,7 +206,7 @@ void wxRegion::GetBox(long& x, long& y, long&w, long &h) const wxRect wxRegion::GetBox() const { - long x, y, w, h; + wxCoord x, y, w, h; GetBox(x, y, w, h); return wxRect(x, y, w, h); } @@ -223,7 +223,7 @@ bool wxRegion::Empty() const //----------------------------------------------------------------------------- // Does the region contain the point (x,y)? -wxRegionContain wxRegion::Contains(long x, long y) const +wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y) const { bool bOK = FALSE; // temporary if (!m_refData) @@ -250,7 +250,7 @@ wxRegionContain wxRegion::Contains(const wxPoint& pt) const } // Does the region contain the rectangle (x, y, w, h)? -wxRegionContain wxRegion::Contains(long x, long y, long w, long h) const +wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const { bool bOK = FALSE; // temporary if (!m_refData) @@ -269,7 +269,7 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const if (!m_refData) return wxOutRegion; - long x, y, w, h; + wxCoord x, y, w, h; x = rect.x; y = rect.y; w = rect.GetWidth(); @@ -356,28 +356,28 @@ void wxRegionIterator::operator ++ (int) ++m_current; } -long wxRegionIterator::GetX() const +wxCoord wxRegionIterator::GetX() const { if (m_current < m_numRects) return m_rects[m_current].x; return 0; } -long wxRegionIterator::GetY() const +wxCoord wxRegionIterator::GetY() const { if (m_current < m_numRects) return m_rects[m_current].y; return 0; } -long wxRegionIterator::GetW() const +wxCoord wxRegionIterator::GetW() const { if (m_current < m_numRects) return m_rects[m_current].width ; return 0; } -long wxRegionIterator::GetH() const +wxCoord wxRegionIterator::GetH() const { if (m_current < m_numRects) return m_rects[m_current].height;