Don't dereference invalid iterator in wxDateTime::ParseDate().

[wxWidgets.git] / src / cocoa / region.mm

diff --git a/src/cocoa/region.mm b/src/cocoa/region.mm
index 170ef49b6f77637bdcc9951b7c8f6fa7226b534b..14cd20984f5e564c2f637418c555635e653c0d54 100644 (file)
--- a/src/cocoa/region.mm
+++ b/src/cocoa/region.mm
@@ -1,15 +1,46 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/region.mm
+// Name:        src/cocoa/region.mm

 // Purpose:     wxRegion class
 // Author:      David Elliott
 // Purpose:     wxRegion class
 // Author:      David Elliott

-// Modified by: 
+// Modified by:

 // Created:     2004/04/12
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott
 // Created:     2004/04/12
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott

-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

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

+#import <Foundation/NSGeometry.h>
+

 IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
 

+inline wxRect NSRectToWxRect(const NSRect& rect)
+{
+    return wxRect((wxCoord)rect.origin.x, (wxCoord)rect.origin.y,
+        (wxCoord)rect.size.width, (wxCoord)rect.size.height);
+}
+
+wxRegion::wxRegion(const NSRect& rect)
+{
+    Union(NSRectToWxRect(rect));
+}
+
+wxRegion::wxRegion(const NSRect *rects, int count)
+{
+    for(int i=0; i<count; i++)
+    {
+        Union(NSRectToWxRect(rects[i]));
+    }
+}