Explicitly set "C" locale for the tests using decimal point.

[wxWidgets.git] / src / osx / carbon / region.cpp

diff --git a/src/osx/carbon/region.cpp b/src/osx/carbon/region.cpp
index 1df36935a32dd09ec113e956b4b8972a8c33fdba..2d5fad856963736fb2fd0eb0d741e09757c68848 100644 (file)
--- a/src/osx/carbon/region.cpp
+++ b/src/osx/carbon/region.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// File:      src/mac/carbon/region.cpp
+// File:      src/osx/carbon/region.cpp

 // Purpose:   Region class
 // Author:    Stefan Csomor
 // Created:   Fri Oct 24 10:46:34 MET 1997
 // Purpose:   Region class
 // Author:    Stefan Csomor
 // Created:   Fri Oct 24 10:46:34 MET 1997


@@ -10,6 +10,8 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#if wxOSX_USE_COCOA_OR_CARBON
+

 #include "wx/region.h"
 
 #ifndef WX_PRECOMP
 #include "wx/region.h"
 
 #ifndef WX_PRECOMP


@@ -301,7 +303,7 @@ wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const
     if (!m_refData)
         return wxOutRegion;
 
     if (!m_refData)
         return wxOutRegion;
 

-    CGPoint p = { y , x } ;
+    CGPoint p = { x, y } ;

     if (HIShapeContainsPoint( M_REGION , &p ) )
         return wxInRegion;
 
     if (HIShapeContainsPoint( M_REGION , &p ) )
         return wxInRegion;
 


@@ -344,11 +346,7 @@ wxRegionIterator::wxRegionIterator()
 
 wxRegionIterator::~wxRegionIterator()
 {
 
 wxRegionIterator::~wxRegionIterator()
 {

-    if (m_rects)
-    {
-        delete [] m_rects;
-        m_rects = NULL;
-    }
+    wxDELETEA(m_rects);

 }
 
 wxRegionIterator::wxRegionIterator(const wxRegionIterator& iterator)
 }
 
 wxRegionIterator::wxRegionIterator(const wxRegionIterator& iterator)


@@ -373,11 +371,7 @@ wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& iterator)
  */
 void wxRegionIterator::SetRects(long numRects, wxRect *rects)
 {
  */
 void wxRegionIterator::SetRects(long numRects, wxRect *rects)
 {

-    if (m_rects)
-    {
-        delete [] m_rects;
-        m_rects = NULL;
-    }
+    wxDELETEA(m_rects);

 
     if (rects && (numRects > 0))
     {
 
     if (rects && (numRects > 0))
     {


@@ -481,11 +475,7 @@ void wxRegionIterator::Reset(const wxRegion& region)
     m_current = 0;
     m_region = region;
 
     m_current = 0;
     m_region = region;
 

-    if (m_rects)
-    {
-        delete [] m_rects;
-        m_rects = NULL;
-    }
+    wxDELETEA(m_rects);

 
     if (m_region.IsEmpty())
     {
 
     if (m_region.IsEmpty())
     {


@@ -606,3 +596,5 @@ long wxRegionIterator::GetH() const
 
     return 0;
 }
 
     return 0;
 }

+
+#endif