Remove unnecessary duplicate code dealing with invoking window from wxOSX.

[wxWidgets.git] / include / wx / cocoa / region.h

diff --git a/include/wx/cocoa/region.h b/include/wx/cocoa/region.h
index c7d48a92a71d3912a4cca515cc1851bac53204e3..de34bbf747cbca46426a58855746b689a6fff975 100644 (file)
--- a/include/wx/cocoa/region.h
+++ b/include/wx/cocoa/region.h
@@ -2,11 +2,11 @@
 // Name:        wx/cocoa/region.h
 // Purpose:     wxRegion class
 // Author:      David Elliott
-// Modified by: 
+// Modified by:
 // Created:     2004/04/12
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_REGION_H__
@@ -14,9 +14,13 @@
 
 #include "wx/generic/region.h"
 
+#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64)
+typedef struct CGRect NSRect;
+#else
 typedef struct _NSRect NSRect;
+#endif
 
-class WXDLLEXPORT wxRegion : public wxRegionGeneric
+class WXDLLIMPEXP_CORE wxRegion : public wxRegionGeneric
 {
 public:
     wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
@@ -51,7 +55,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxRegion);
 };
 
-class WXDLLEXPORT wxRegionIterator : public wxRegionIteratorGeneric
+class WXDLLIMPEXP_CORE wxRegionIterator : public wxRegionIteratorGeneric
 {
 //    DECLARE_DYNAMIC_CLASS(wxRegionIteratorGeneric);
 public:
@@ -68,4 +72,5 @@ public:
     {   return *(wxRegionIterator*)&(this->wxRegionIteratorGeneric::operator=(iter)); }
 };
 
-#endif //ndef _WX_COCOA_REGION_H__
+#endif
+    //ndef _WX_COCOA_REGION_H__