Unicode compilation fixes

[wxWidgets.git] / src / mac / classic / region.cpp

diff --git a/src/mac/classic/region.cpp b/src/mac/classic/region.cpp
index 8920707ed2344150c88a0cfa4f99dedbb1abe7b3..6d3e1bafc5756b656bb014017404a44bd4d0b1e1 100644 (file)
--- a/src/mac/classic/region.cpp
+++ b/src/mac/classic/region.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// File:      region.cpp
+// File:      src/mac/classic/region.cpp
 // Purpose:   Region class
 // Author:    Stefan Csomor
 // Created:   Fri Oct 24 10:46:34 MET 1997
@@ -8,8 +8,14 @@
 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/wxprec.h"
+
 #include "wx/region.h"
-#include "wx/gdicmn.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
@@ -33,7 +39,7 @@ public:
         CopyRgn( data.m_macRgn , m_macRgn ) ;
     }
 
-    ~wxRegionRefData()
+    virtual ~wxRegionRefData()
     {
         DisposeRgn( m_macRgn ) ;
     }
@@ -101,11 +107,11 @@ void wxRegion::Clear()
 bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op)
 {
     // Don't change shared data
-    if (!m_refData) 
+    if (!m_refData)
     {
         m_refData = new wxRegionRefData();
-    } 
-    else if (m_refData->GetRefCount() > 1) 
+    }
+    else if (m_refData->GetRefCount() > 1)
     {
         wxRegionRefData* ref = (wxRegionRefData*)m_refData;
         UnRef();
@@ -113,7 +119,7 @@ bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op)
     }
     RgnHandle rgn = NewRgn() ;
         SetRectRgn( rgn , x , y, x+width,y + height ) ;
-        
+
     switch (op)
     {
         case wxRGN_AND:
@@ -136,20 +142,20 @@ bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op)
 
         DisposeRgn( rgn ) ;
 
-    return TRUE;
+    return true;
 }
 
 //! Union /e region with this.
 bool wxRegion::Combine(const wxRegion& region, wxRegionOp op)
 {
     if (region.Empty())
-        return FALSE;
+        return false;
 
     // Don't change shared data
     if (!m_refData) {
         m_refData = new wxRegionRefData();
-    } 
-    else    if (m_refData->GetRefCount() > 1) 
+    }
+    else if (m_refData->GetRefCount() > 1)
     {
         wxRegionRefData* ref = (wxRegionRefData*)m_refData;
         UnRef();
@@ -176,7 +182,7 @@ bool wxRegion::Combine(const wxRegion& region, wxRegionOp op)
             break ;
     }
 
-    return TRUE;
+    return true;
 }
 
 bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
@@ -191,7 +197,7 @@ bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
 // Outer bounds of region
 void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const
 {
-    if (m_refData) 
+    if (m_refData)
     {
         Rect box ;
         GetRegionBounds( M_REGION , &box ) ;
@@ -199,8 +205,8 @@ void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const
         y = box.top ;
         w = box.right - box.left ;
         h = box.bottom - box.top ;
-    } 
-    else 
+    }
+    else
     {
         x = y = w = h = 0;
     }
@@ -249,7 +255,7 @@ wxRegionContain wxRegion::Contains(const wxPoint& pt) const
     Point p = { pt.y , pt.x } ;
     if (PtInRgn( p , M_REGION ) )
         return wxInRegion;
-        
+
     return wxOutRegion;
 }
 
@@ -428,4 +434,3 @@ long wxRegionIterator::GetH() const
         return m_rects[m_current].height;
     return 0;
 }
-