Fix duplicate wxContextMenuEvent generation in wxMSW.

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

diff --git a/src/msw/region.cpp b/src/msw/region.cpp
index 565ddf949c190c8e2285d0a13f0e1ae9b54eba1e..fece55e9c5e9357e0ceeec86bc44efa420e60191 100644 (file)
--- a/src/msw/region.cpp
+++ b/src/msw/region.cpp
@@ -72,7 +72,7 @@ public:
 
 private:
 // Cannot use
 
 private:
 // Cannot use

-//  DECLARE_NO_COPY_CLASS(wxRegionRefData)
+//  wxDECLARE_NO_COPY_CLASS(wxRegionRefData);

 // because copy constructor is explicitly declared above;
 // but no copy assignment operator is defined, so declare
 // it private to prevent the compiler from defining it:
 // because copy constructor is explicitly declared above;
 // but no copy assignment operator is defined, so declare
 // it private to prevent the compiler from defining it:


@@ -92,7 +92,7 @@ private:
 
 wxRegion::wxRegion()
 {
 
 wxRegion::wxRegion()
 {

-    m_refData = (wxRegionRefData *)NULL;
+    m_refData = NULL;

 }
 
 wxRegion::wxRegion(WXHRGN hRegion)
 }
 
 wxRegion::wxRegion(WXHRGN hRegion)


@@ -119,7 +119,7 @@ wxRegion::wxRegion(const wxRect& rect)
     M_REGION = ::CreateRectRgn(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
 }
 
     M_REGION = ::CreateRectRgn(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
 }
 

-wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle)
+wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle)

 {
 #if defined(__WXMICROWIN__) || defined(__WXWINCE__)
     wxUnusedVar(n);
 {
 #if defined(__WXMICROWIN__) || defined(__WXWINCE__)
     wxUnusedVar(n);


@@ -143,12 +143,12 @@ wxRegion::~wxRegion()
     // m_refData unrefed in ~wxObject
 }
 
     // m_refData unrefed in ~wxObject
 }
 

-wxObjectRefData *wxRegion::CreateRefData() const
+wxGDIRefData *wxRegion::CreateGDIRefData() const

 {
     return new wxRegionRefData;
 }
 
 {
     return new wxRegionRefData;
 }
 

-wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const

 {
     return new wxRegionRefData(*(wxRegionRefData *)data);
 }
 {
     return new wxRegionRefData(*(wxRegionRefData *)data);
 }


@@ -163,9 +163,10 @@ void wxRegion::Clear()
     UnRef();
 }
 
     UnRef();
 }
 

-bool wxRegion::Offset(wxCoord x, wxCoord y)
+bool wxRegion::DoOffset(wxCoord x, wxCoord y)

 {
 {

-    wxCHECK_MSG( M_REGION, false, _T("invalid wxRegion") );
+    const HRGN hrgn = GetHrgn();
+    wxCHECK_MSG( hrgn, false, wxT("invalid wxRegion") );

 
     if ( !x && !y )
     {
 
     if ( !x && !y )
     {


@@ -175,9 +176,9 @@ bool wxRegion::Offset(wxCoord x, wxCoord y)
 
     AllocExclusive();
 
 
     AllocExclusive();
 

-    if ( ::OffsetRgn(GetHrgn(), x, y) == ERROR )
+    if ( ::OffsetRgn(hrgn, x, y) == ERROR )

     {
     {

-        wxLogLastError(_T("OffsetRgn"));
+        wxLogLastError(wxT("OffsetRgn"));

 
         return false;
     }
 
         return false;
     }


@@ -186,7 +187,7 @@ bool wxRegion::Offset(wxCoord x, wxCoord y)
 }
 
 // combine another region with this one
 }
 
 // combine another region with this one

-bool wxRegion::Combine(const wxRegion& rgn, wxRegionOp op)
+bool wxRegion::DoCombine(const wxRegion& rgn, wxRegionOp op)

 {
     // we can't use the API functions if we don't have a valid region handle
     if ( !m_refData )
 {
     // we can't use the API functions if we don't have a valid region handle
     if ( !m_refData )


@@ -202,7 +203,7 @@ bool wxRegion::Combine(const wxRegion& rgn, wxRegionOp op)
                 break;
 
             default:
                 break;
 
             default:

-                wxFAIL_MSG( _T("unknown region operation") );
+                wxFAIL_MSG( wxT("unknown region operation") );

                 // fall through
 
             case wxRGN_AND:
                 // fall through
 
             case wxRGN_AND:


@@ -235,7 +236,7 @@ bool wxRegion::Combine(const wxRegion& rgn, wxRegionOp op)
                 break;
 
             default:
                 break;
 
             default:

-                wxFAIL_MSG( _T("unknown region operation") );
+                wxFAIL_MSG( wxT("unknown region operation") );

                 // fall through
 
             case wxRGN_COPY:
                 // fall through
 
             case wxRGN_COPY:


@@ -245,7 +246,7 @@ bool wxRegion::Combine(const wxRegion& rgn, wxRegionOp op)
 
         if ( ::CombineRgn(M_REGION, M_REGION, M_REGION_OF(rgn), mode) == ERROR )
         {
 
         if ( ::CombineRgn(M_REGION, M_REGION, M_REGION_OF(rgn), mode) == ERROR )
         {

-            wxLogLastError(_T("CombineRgn"));
+            wxLogLastError(wxT("CombineRgn"));

 
             return false;
         }
 
             return false;
         }


@@ -254,26 +255,12 @@ bool wxRegion::Combine(const wxRegion& rgn, wxRegionOp op)
     return true;
 }
 
     return true;
 }
 

-// Combine rectangle (x, y, w, h) with this.
-bool wxRegion::Combine(wxCoord x, wxCoord y,
-                       wxCoord width, wxCoord height,
-                       wxRegionOp op)
-{
-    return Combine(wxRegion(x, y, width, height), op);
-}
-
-bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
-{
-    return Combine(rect.GetLeft(), rect.GetTop(),
-                   rect.GetWidth(), rect.GetHeight(), op);
-}
-

 // ----------------------------------------------------------------------------
 // wxRegion bounding box
 // ----------------------------------------------------------------------------
 
 // Outer bounds of region
 // ----------------------------------------------------------------------------
 // wxRegion bounding box
 // ----------------------------------------------------------------------------
 
 // Outer bounds of region

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

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


@@ -283,22 +270,19 @@ void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const
         y = rect.top;
         w = rect.right - rect.left;
         h = rect.bottom - rect.top;
         y = rect.top;
         w = rect.right - rect.left;
         h = rect.bottom - rect.top;

+
+        return true;

     }
     else
     {
         x = y = w = h = 0;
     }
     else
     {
         x = y = w = h = 0;

-    }
-}

 
 

-wxRect wxRegion::GetBox() const
-{
-    wxCoord x, y, w, h;
-    GetBox(x, y, w, h);
-    return wxRect(x, y, w, h);
+        return false;
+    }

 }
 
 // Is region empty?
 }
 
 // Is region empty?

-bool wxRegion::Empty() const
+bool wxRegion::IsEmpty() const

 {
     wxCoord x, y, w, h;
     GetBox(x, y, w, h);
 {
     wxCoord x, y, w, h;
     GetBox(x, y, w, h);


@@ -306,12 +290,17 @@ bool wxRegion::Empty() const
     return (w == 0) && (h == 0);
 }
 
     return (w == 0) && (h == 0);
 }
 

+bool wxRegion::DoIsEqual(const wxRegion& region) const
+{
+    return ::EqualRgn(M_REGION, M_REGION_OF(region)) != 0;
+}
+

 // ----------------------------------------------------------------------------
 // wxRegion hit testing
 // ----------------------------------------------------------------------------
 
 // Does the region contain the point (x,y)?
 // ----------------------------------------------------------------------------
 // wxRegion hit testing
 // ----------------------------------------------------------------------------
 
 // Does the region contain the point (x,y)?

-wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y) const
+wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const

 {
     if (!m_refData)
         return wxOutRegion;
 {
     if (!m_refData)
         return wxOutRegion;


@@ -319,32 +308,16 @@ wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y) const
     return ::PtInRegion(M_REGION, (int) x, (int) y) ? wxInRegion : wxOutRegion;
 }
 
     return ::PtInRegion(M_REGION, (int) x, (int) y) ? wxInRegion : wxOutRegion;
 }
 

-// Does the region contain the point pt?
-wxRegionContain wxRegion::Contains(const wxPoint& pt) const
-{
-    return Contains(pt.x, pt.y);
-}
-

 // Does the region contain the rectangle (x, y, w, h)?
 // Does the region contain the rectangle (x, y, w, h)?

-wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y,
-                                   wxCoord w, wxCoord h) const
+wxRegionContain wxRegion::DoContainsRect(const wxRect& rect) const

 {
     if (!m_refData)
         return wxOutRegion;
 
 {
     if (!m_refData)
         return wxOutRegion;
 

-    RECT rect;
-    rect.left = x;
-    rect.top = y;
-    rect.right = x + w;
-    rect.bottom = y + h;
+    RECT rc;
+    wxCopyRectToRECT(rect, rc);

 
 

-    return ::RectInRegion(M_REGION, &rect) ? wxInRegion : wxOutRegion;
-}
-
-// Does the region contain the rectangle rect
-wxRegionContain wxRegion::Contains(const wxRect& rect) const
-{
-    return Contains(rect.x, rect.y, rect.width, rect.height);
+    return ::RectInRegion(M_REGION, &rc) ? wxInRegion : wxOutRegion;

 }
 
 // Get internal region handle
 }
 
 // Get internal region handle


@@ -412,12 +385,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.Empty())
         m_numRects = 0;
 
     if (m_region.Empty())
         m_numRects = 0;


@@ -469,28 +437,28 @@ wxRegionIterator wxRegionIterator::operator ++ (int)
 
 wxCoord wxRegionIterator::GetX() const
 {
 
 wxCoord wxRegionIterator::GetX() const
 {

-    wxCHECK_MSG( m_current < m_numRects, 0, _T("invalid wxRegionIterator") );
+    wxCHECK_MSG( m_current < m_numRects, 0, wxT("invalid wxRegionIterator") );

 
     return m_rects[m_current].x;
 }
 
 wxCoord wxRegionIterator::GetY() const
 {
 
     return m_rects[m_current].x;
 }
 
 wxCoord wxRegionIterator::GetY() const
 {

-    wxCHECK_MSG( m_current < m_numRects, 0, _T("invalid wxRegionIterator") );
+    wxCHECK_MSG( m_current < m_numRects, 0, wxT("invalid wxRegionIterator") );

 
     return m_rects[m_current].y;
 }
 
 wxCoord wxRegionIterator::GetW() const
 {
 
     return m_rects[m_current].y;
 }
 
 wxCoord wxRegionIterator::GetW() const
 {

-    wxCHECK_MSG( m_current < m_numRects, 0, _T("invalid wxRegionIterator") );
+    wxCHECK_MSG( m_current < m_numRects, 0, wxT("invalid wxRegionIterator") );

 
     return m_rects[m_current].width;
 }
 
 wxCoord wxRegionIterator::GetH() const
 {
 
     return m_rects[m_current].width;
 }
 
 wxCoord wxRegionIterator::GetH() const
 {

-    wxCHECK_MSG( m_current < m_numRects, 0, _T("invalid wxRegionIterator") );
+    wxCHECK_MSG( m_current < m_numRects, 0, wxT("invalid wxRegionIterator") );

 
     return m_rects[m_current].height;
 }
 
     return m_rects[m_current].height;
 }