From 9b1801c19c82340be79810c8b7617b05caa0cd59 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 6 Feb 2000 12:12:25 +0000
Subject: [PATCH] long -> wxCoord
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/wx/msw/region.h | 30 +++++++++++++++---------------
src/msw/region.cpp | 24 ++++++++++++------------
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h
index 4349debda6..88d9e9a2ce 100644
--- a/include/wx/msw/region.h
+++ b/include/wx/msw/region.h
@@ -40,7 +40,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
@@ -59,29 +59,29 @@ public:
void Clear(void);
// 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(void) const ;
// Is region empty?
@@ -90,16 +90,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);
@@ -126,12 +126,12 @@ public:
void operator ++ (void);
void operator ++ (int);
- long GetX(void) const;
- long GetY(void) const;
- long GetW(void) const;
- long GetWidth(void) const { return GetW(); }
- long GetH(void) const;
- long GetHeight(void) const { return GetH(); }
+ wxCoord GetX(void) const;
+ wxCoord GetY(void) const;
+ wxCoord GetW(void) const;
+ wxCoord GetWidth(void) const { return GetW(); }
+ wxCoord GetH(void) const;
+ wxCoord GetHeight(void) const { return GetH(); }
wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
private:
diff --git a/src/msw/region.cpp b/src/msw/region.cpp
index e40c381e7d..0e1cab3ea9 100644
--- a/src/msw/region.cpp
+++ b/src/msw/region.cpp
@@ -86,7 +86,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;
M_REGION = ::CreateRectRgn(x, y, x + w, y + h);
@@ -123,7 +123,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) {
@@ -196,7 +196,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) {
RECT rect;
@@ -212,7 +212,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);
}
@@ -222,7 +222,7 @@ bool wxRegion::Empty() const
{
if (M_REGION == 0)
return TRUE;
- long x, y, w, h;
+ wxCoord x, y, w, h;
GetBox(x, y, w, h);
return ((w == 0) && (h == 0));
@@ -233,7 +233,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
{
if (!m_refData)
return wxOutRegion;
@@ -257,7 +257,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
{
if (!m_refData)
return wxOutRegion;
@@ -280,7 +280,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();
@@ -397,28 +397,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;
--
2.47.2