AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

corrected warnings when compiling with -Wall -W

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot 2002-05-08 13:24:00 +00:00
parent 01babda34e
commit e7600a2cab
3 changed files with 190 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
include/wx/mac/region.h
View File

@ -43,94 +43,112 @@ public:
wxRegion(long x, long y, long w, long h);
wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
wxRegion(const wxRect& rect);
wxRegion( WXHRGN hRegion );
wxRegion();
~wxRegion();
//# Copying
inline wxRegion(const wxRegion& r)
{ Ref(r); }
inline wxRegion& operator = (const wxRegion& r)
{ Ref(r); return (*this); }
//# Modify region
// Clear current region
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(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(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:
wxRegion( WXHRGN hRegion );
wxRegion();
~wxRegion();
//# Copying
wxRegion(const wxRegion& r)
: wxGDIObject()
{ Ref(r); }
wxRegion& operator = (const wxRegion& r)
{ Ref(r); return (*this); }
//# Modify region
// Clear current region
void Clear();
// Union rectangle or region with this.
bool Union(long x, long y, long width, long height)
{ return Combine(x, y, width, height, wxRGN_OR); }
bool Union(const wxRect& rect)
{ return Combine(rect, wxRGN_OR); }
bool Union(const wxRegion& region)
{ return Combine(region, wxRGN_OR); }
// Intersect rectangle or region with this.
bool Intersect(long x, long y, long width, long height)
{ return Combine(x, y, width, height, wxRGN_AND); }
bool Intersect(const wxRect& rect)
{ return Combine(rect, wxRGN_AND); }
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(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(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(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const;
wxRect GetBox() const ;
// Is region empty?
bool Empty() const;
bool Subtract(long x, long y, long width, long height)
{ return Combine(x, y, width, height, wxRGN_DIFF); }
bool Subtract(const wxRect& rect)
{ return Combine(rect, wxRGN_DIFF); }
bool Subtract(const wxRegion& region)
{ return Combine(region, wxRGN_DIFF); }
// XOR: the union of two combined regions except for any overlapping areas.
bool Xor(long x, long y, long width, long height)
{ return Combine(x, y, width, height, wxRGN_XOR); }
bool Xor(const wxRect& rect)
{ return Combine(rect, wxRGN_XOR); }
bool Xor(const wxRegion& region)
{ return Combine(region, wxRGN_XOR); }
//# Information on region
// Outer bounds of region
void GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const;
wxRect GetBox() const ;
// Is region empty?
bool Empty() const;
inline bool IsEmpty() const { return Empty(); }
//# Tests
// Does the region contain the point (x,y)?
wxRegionContain Contains(long x, long 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;
// 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(const wxRegion& region, wxRegionOp op);
bool Combine(const wxRect& rect, wxRegionOp op);
const WXHRGN GetWXHRGN() const ;
//# Tests
// Does the region contain the point (x,y)?
wxRegionContain Contains(long x, long 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;
// 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(const wxRegion& region, wxRegionOp op);
bool Combine(const wxRect& rect, wxRegionOp op);
const WXHRGN GetWXHRGN() const ;
};
class WXDLLEXPORT wxRegionIterator : public wxObject {
DECLARE_DYNAMIC_CLASS(wxRegionIterator);
class WXDLLEXPORT wxRegionIterator : public wxObject
{
DECLARE_DYNAMIC_CLASS(wxRegionIterator)
public:
wxRegionIterator();
wxRegionIterator(const wxRegion& region);
~wxRegionIterator();
wxRegionIterator();
wxRegionIterator(const wxRegion& region);
wxRegionIterator(const wxRegionIterator& iterator);
~wxRegionIterator();
void Reset() { m_current = 0; }
void Reset(const wxRegion& region);
operator bool () const { return m_current < m_numRects; }
bool HaveRects() const { return m_current < m_numRects; }
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(); }
wxRegionIterator& operator=(const wxRegionIterator& iterator);
void Reset() { m_current = 0; }
void Reset(const wxRegion& region);
operator bool () const { return m_current < m_numRects; }
bool HaveRects() const { return m_current < m_numRects; }
wxRegionIterator& operator++();
wxRegionIterator operator++(int);
long GetX() const;
long GetY() const;
long GetW() const;
long GetWidth() const { return GetW(); }
long GetH() const;
long GetHeight() const { return GetH(); }
wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
private:
long m_current;
long m_numRects;
wxRegion m_region;
long m_current;
long m_numRects;
wxRegion m_region;
wxRect* m_rects;
};

69
src/mac/carbon/region.cpp
View File

@ -27,22 +27,23 @@
class WXDLLEXPORT wxRegionRefData : public wxGDIRefData {
public:
wxRegionRefData()
{
m_macRgn = NewRgn() ;
}
wxRegionRefData()
{
m_macRgn = NewRgn() ;
}
wxRegionRefData(const wxRegionRefData& data)
{
m_macRgn = NewRgn() ;
wxRegionRefData(const wxRegionRefData& data)
: wxGDIRefData()
{
m_macRgn = NewRgn() ;
CopyRgn( data.m_macRgn , m_macRgn ) ;
}
}
~wxRegionRefData()
{
~wxRegionRefData()
{
DisposeRgn( m_macRgn ) ;
}
RgnHandle m_macRgn ;
}
RgnHandle m_macRgn ;
};
#define M_REGION (((wxRegionRefData*)m_refData)->m_macRgn)
@ -286,15 +287,16 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const
}
///////////////////////////////////////////////////////////////////////////////
// //
// wxRegionIterator //
// //
// //
// wxRegionIterator //
// //
///////////////////////////////////////////////////////////////////////////////
/*!
* Initialize empty iterator
*/
wxRegionIterator::wxRegionIterator() : m_current(0), m_numRects(0), m_rects(NULL)
wxRegionIterator::wxRegionIterator()
: m_current(0), m_numRects(0), m_rects(NULL)
{
}
@ -304,6 +306,22 @@ wxRegionIterator::~wxRegionIterator()
delete[] m_rects;
}
wxRegionIterator::wxRegionIterator(const wxRegionIterator& iterator)
: wxObject()
, m_current(iterator.m_current)
, m_numRects(iterator.m_numRects)
, m_rects(iterator.m_rects)
{
}
wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& iterator)
{
m_current = iterator.m_current;
m_numRects = iterator.m_numRects;
m_rects = iterator.m_rects;
return *this;
}
/*!
* Initialize iterator for region
*/
@ -311,7 +329,7 @@ wxRegionIterator::wxRegionIterator(const wxRegion& region)
{
m_rects = NULL;
Reset(region);
Reset(region);
}
/*!
@ -347,20 +365,25 @@ void wxRegionIterator::Reset(const wxRegion& region)
* Increment iterator. The rectangle returned is the one after the
* incrementation.
*/
void wxRegionIterator::operator ++ ()
wxRegionIterator& wxRegionIterator::operator ++ ()
{
if (m_current < m_numRects)
++m_current;
if (m_current < m_numRects)
++m_current;
return *this;
}
/*!
* Increment iterator. The rectangle returned is the one before the
* incrementation.
*/
void wxRegionIterator::operator ++ (int)
wxRegionIterator wxRegionIterator::operator ++ (int)
{
if (m_current < m_numRects)
++m_current;
wxRegionIterator previous(*this);
if (m_current < m_numRects)
++m_current;
return previous;
}
long wxRegionIterator::GetX() const

69
src/mac/region.cpp
View File

@ -27,22 +27,23 @@
class WXDLLEXPORT wxRegionRefData : public wxGDIRefData {
public:
wxRegionRefData()
{
m_macRgn = NewRgn() ;
}
wxRegionRefData()
{
m_macRgn = NewRgn() ;
}
wxRegionRefData(const wxRegionRefData& data)
{
m_macRgn = NewRgn() ;
wxRegionRefData(const wxRegionRefData& data)
: wxGDIRefData()
{
m_macRgn = NewRgn() ;
CopyRgn( data.m_macRgn , m_macRgn ) ;
}
}
~wxRegionRefData()
{
~wxRegionRefData()
{
DisposeRgn( m_macRgn ) ;
}
RgnHandle m_macRgn ;
}
RgnHandle m_macRgn ;
};
#define M_REGION (((wxRegionRefData*)m_refData)->m_macRgn)
@ -286,15 +287,16 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const
}
///////////////////////////////////////////////////////////////////////////////
// //
// wxRegionIterator //
// //
// //
// wxRegionIterator //
// //
///////////////////////////////////////////////////////////////////////////////
/*!
* Initialize empty iterator
*/
wxRegionIterator::wxRegionIterator() : m_current(0), m_numRects(0), m_rects(NULL)
wxRegionIterator::wxRegionIterator()
: m_current(0), m_numRects(0), m_rects(NULL)
{
}
@ -304,6 +306,22 @@ wxRegionIterator::~wxRegionIterator()
delete[] m_rects;
}
wxRegionIterator::wxRegionIterator(const wxRegionIterator& iterator)
: wxObject()
, m_current(iterator.m_current)
, m_numRects(iterator.m_numRects)
, m_rects(iterator.m_rects)
{
}
wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& iterator)
{
m_current = iterator.m_current;
m_numRects = iterator.m_numRects;
m_rects = iterator.m_rects;
return *this;
}
/*!
* Initialize iterator for region
*/
@ -311,7 +329,7 @@ wxRegionIterator::wxRegionIterator(const wxRegion& region)
{
m_rects = NULL;
Reset(region);
Reset(region);
}
/*!
@ -347,20 +365,25 @@ void wxRegionIterator::Reset(const wxRegion& region)
* Increment iterator. The rectangle returned is the one after the
* incrementation.
*/
void wxRegionIterator::operator ++ ()
wxRegionIterator& wxRegionIterator::operator ++ ()
{
if (m_current < m_numRects)
++m_current;
if (m_current < m_numRects)
++m_current;
return *this;
}
/*!
* Increment iterator. The rectangle returned is the one before the
* incrementation.
*/
void wxRegionIterator::operator ++ (int)
wxRegionIterator wxRegionIterator::operator ++ (int)
{
if (m_current < m_numRects)
++m_current;
wxRegionIterator previous(*this);
if (m_current < m_numRects)
++m_current;
return previous;
}
long wxRegionIterator::GetX() const