corrected warnings when compiling with -Wall -W

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/mac/region.h

@@ -48,9 +48,10 @@ public:
     ~wxRegion();
     
     //# Copying
-	inline wxRegion(const wxRegion& r)
+    wxRegion(const wxRegion& r)
+        : wxGDIObject()
     { Ref(r); }
-	inline wxRegion& operator = (const wxRegion& r)
+    wxRegion& operator = (const wxRegion& r)
     { Ref(r); return (*this); }
     
     //# Modify region
@@ -58,25 +59,37 @@ 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); }
+    bool Union(long x, long y, long width, long height)
-	inline bool Union(const wxRect& rect) { return Combine(rect, wxRGN_OR); }
+        { return Combine(x, y, width, height, wxRGN_OR); }
-	inline bool Union(const wxRegion& region) { return Combine(region, 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.
-	inline bool Intersect(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_AND); }
+    bool Intersect(long x, long y, long width, long height)
-	inline bool Intersect(const wxRect& rect)  { return Combine(rect, wxRGN_AND); }
+        { return Combine(x, y, width, height, wxRGN_AND); }
-	inline bool Intersect(const wxRegion& region)  { return Combine(region, 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); }
+    bool Subtract(long x, long y, long width, long height)
-	inline bool Subtract(const wxRect& rect)  { return Combine(rect, wxRGN_DIFF); }
+        { return Combine(x, y, width, height, wxRGN_DIFF); }
-	inline bool Subtract(const wxRegion& region)  { return Combine(region, 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.
-	inline bool Xor(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_XOR); }
+    bool Xor(long x, long y, long width, long height)
-	inline bool Xor(const wxRect& rect)  { return Combine(rect, wxRGN_XOR); }
+        { return Combine(x, y, width, height, wxRGN_XOR); }
-	inline bool Xor(const wxRegion& region)  { return Combine(region, 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
@@ -104,21 +117,26 @@ public:
     const WXHRGN GetWXHRGN() const ;
 };
 
-class WXDLLEXPORT wxRegionIterator : public wxObject {
+class WXDLLEXPORT wxRegionIterator : public wxObject
-DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+{
+    DECLARE_DYNAMIC_CLASS(wxRegionIterator)
+        
 public:
     wxRegionIterator();
     wxRegionIterator(const wxRegion& region);
+    wxRegionIterator(const wxRegionIterator& iterator);
     ~wxRegionIterator();
 
+    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; }
     
-	void operator ++ ();
+    wxRegionIterator& operator++();
-	void operator ++ (int);
+    wxRegionIterator operator++(int);
     
     long GetX() const;
     long GetY() const;

src/mac/carbon/region.cpp

@@ -33,6 +33,7 @@ public:
     }
 
     wxRegionRefData(const wxRegionRefData& data)
+        : wxGDIRefData()
     {
         m_macRgn = NewRgn() ;
         CopyRgn( data.m_macRgn , m_macRgn ) ;
@@ -294,7 +295,8 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const
 /*!
  * 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
  */
@@ -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;
+    return *this;
 }
 
 /*!
  * Increment iterator. The rectangle returned is the one before the
  * incrementation.
  */
-void wxRegionIterator::operator ++ (int)
+wxRegionIterator wxRegionIterator::operator ++ (int)
 {
+    wxRegionIterator previous(*this);
+
     if (m_current < m_numRects)
         ++m_current;
+
+    return previous;
 }
 
 long wxRegionIterator::GetX() const

src/mac/region.cpp

@@ -33,6 +33,7 @@ public:
     }
 
     wxRegionRefData(const wxRegionRefData& data)
+        : wxGDIRefData()
     {
         m_macRgn = NewRgn() ;
         CopyRgn( data.m_macRgn , m_macRgn ) ;
@@ -294,7 +295,8 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const
 /*!
  * 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
  */
@@ -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;
+    return *this;
 }
 
 /*!
  * Increment iterator. The rectangle returned is the one before the
  * incrementation.
  */
-void wxRegionIterator::operator ++ (int)
+wxRegionIterator wxRegionIterator::operator ++ (int)
 {
+    wxRegionIterator previous(*this);
+
     if (m_current < m_numRects)
         ++m_current;
+
+    return previous;
 }
 
 long wxRegionIterator::GetX() const