Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
Download Patch File Download Diff File Expand all files Collapse all files

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