fixed the menu bug introduced by the previous commit

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

diff --git a/src/mac/region.cpp b/src/mac/region.cpp
index c5c6332e06fbd1c45a0f00372d4a252a2f3aadce..a0204caad5328aaaff03d7d2709186a7b7d7ff69 100644 (file)
--- a/src/mac/region.cpp
+++ b/src/mac/region.cpp
@@ -14,6 +14,7 @@
 
 #include "wx/region.h"
 #include "wx/gdicmn.h"
 
 #include "wx/region.h"
 #include "wx/gdicmn.h"

+#include "wx/mac/uma.h"

 
 #if !USE_SHARED_LIBRARY
        IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
 
 #if !USE_SHARED_LIBRARY
        IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)


@@ -62,25 +63,25 @@ wxRegion::wxRegion()
 wxRegion::wxRegion(WXHRGN hRegion )
 {
     m_refData = new wxRegionRefData;
 wxRegion::wxRegion(WXHRGN hRegion )
 {
     m_refData = new wxRegionRefData;

-    CopyRgn( hRegion , M_REGION ) ;
+    CopyRgn( (RgnHandle) hRegion , (RgnHandle) M_REGION ) ;

 }
 
 wxRegion::wxRegion(long x, long y, long w, long h)
 {
     m_refData = new wxRegionRefData;
 }
 
 wxRegion::wxRegion(long x, long y, long w, long h)
 {
     m_refData = new wxRegionRefData;

-    SetRectRgn( M_REGION , x , y , x+w , y+h ) ;
+    SetRectRgn( (RgnHandle) M_REGION , x , y , x+w , y+h ) ;

 }
 
 wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
 {
     m_refData = new wxRegionRefData;
 }
 
 wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
 {
     m_refData = new wxRegionRefData;

-    SetRectRgn( M_REGION , topLeft.x , topLeft.y , bottomRight.x , bottomRight.y ) ;
+    SetRectRgn( (RgnHandle) M_REGION , topLeft.x , topLeft.y , bottomRight.x , bottomRight.y ) ;

 }
 
 wxRegion::wxRegion(const wxRect& rect)
 {
     m_refData = new wxRegionRefData;
 }
 
 wxRegion::wxRegion(const wxRect& rect)
 {
     m_refData = new wxRegionRefData;

-    SetRectRgn( M_REGION , rect.x , rect.y , rect.x+rect.width , rect.y+rect.height ) ;
+    SetRectRgn( (RgnHandle) M_REGION , rect.x , rect.y , rect.x+rect.width , rect.y+rect.height ) ;

 }
 
 /*!
 }
 
 /*!


@@ -193,11 +194,12 @@ bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
 //-----------------------------------------------------------------------------
 
 // Outer bounds of region
 //-----------------------------------------------------------------------------
 
 // Outer bounds of region

-void wxRegion::GetBox(long& x, long& y, long&w, long &h) const
+void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const

 {
        if (m_refData) 
        {
 {
        if (m_refData) 
        {

-               Rect box = (**M_REGION).rgnBBox ;
+               Rect box ;
+               GetRegionBounds( M_REGION , &box ) ;

         x = box.left ;
         y = box.top ;
         w = box.right - box.left ;
         x = box.left ;
         y = box.top ;
         w = box.right - box.left ;


@@ -211,7 +213,7 @@ void wxRegion::GetBox(long& x, long& y, long&w, long &h) const
 
 wxRect wxRegion::GetBox() const
 {
 
 wxRect wxRegion::GetBox() const
 {

-    long x, y, w, h;
+    wxCoord x, y, w, h;

     GetBox(x, y, w, h);
     return wxRect(x, y, w, h);
 }
     GetBox(x, y, w, h);
     return wxRect(x, y, w, h);
 }


@@ -331,7 +333,8 @@ void wxRegionIterator::Reset(const wxRegion& region)
     {
        // we cannot dissolve it into rects on mac
         m_rects = new wxRect[1];
     {
        // we cannot dissolve it into rects on mac
         m_rects = new wxRect[1];

-        Rect rect = (**OTHER_M_REGION( region )).rgnBBox ;
+               Rect rect ;
+               GetRegionBounds( OTHER_M_REGION( region ) , &rect ) ;

         m_rects[0].x = rect.left;
         m_rects[0].y = rect.top;
         m_rects[0].width = rect.right - rect.left;
         m_rects[0].x = rect.left;
         m_rects[0].y = rect.top;
         m_rects[0].width = rect.right - rect.left;