Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

[wxWidgets.git] / src / generic / regiong.cpp

diff --git a/src/generic/regiong.cpp b/src/generic/regiong.cpp
index 9c7bf1d0345799349fa3c3ab6a8a3fef21b0dad1..bc3a24f8e2f26444f52c1cf0fb3ec5370cd74db1 100644 (file)
--- a/src/generic/regiong.cpp
+++ b/src/generic/regiong.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/generic/region.cpp
+// Name:        src/generic/regiong.cpp

 // Purpose:     generic wxRegion class
 // Author:      David Elliott
 // Modified by:
 // Purpose:     generic wxRegion class
 // Author:      David Elliott
 // Modified by:


@@ -176,12 +176,12 @@ protected:
 // wxRegionRefData
 // ========================================================================
 
 // wxRegionRefData
 // ========================================================================
 

-class wxRegionRefData : public wxObjectRefData,
+class wxRegionRefData : public wxGDIRefData,

                         public REGION
 {
 public:
     wxRegionRefData()
                         public REGION
 {
 public:
     wxRegionRefData()

-        : wxObjectRefData(),
+        : wxGDIRefData(),

           REGION()
     {
         size = 1;
           REGION()
     {
         size = 1;


@@ -194,7 +194,7 @@ public:
     }
 
     wxRegionRefData(const wxPoint& topLeft, const wxPoint& bottomRight)
     }
 
     wxRegionRefData(const wxPoint& topLeft, const wxPoint& bottomRight)

-        : wxObjectRefData(),
+        : wxGDIRefData(),

           REGION()
     {
         rects = (BOX*)malloc(sizeof(BOX));
           REGION()
     {
         rects = (BOX*)malloc(sizeof(BOX));


@@ -208,7 +208,7 @@ public:
     }
 
     wxRegionRefData(const wxRect& rect)
     }
 
     wxRegionRefData(const wxRect& rect)

-        : wxObjectRefData(),
+        : wxGDIRefData(),

           REGION(rect)
     {
         rects = (BOX*)malloc(sizeof(BOX));
           REGION(rect)
     {
         rects = (BOX*)malloc(sizeof(BOX));


@@ -216,7 +216,7 @@ public:
     }
 
     wxRegionRefData(const wxRegionRefData& refData)
     }
 
     wxRegionRefData(const wxRegionRefData& refData)

-        : wxObjectRefData(),
+        : wxGDIRefData(),

           REGION()
     {
         size = refData.size;
           REGION()
     {
         size = refData.size;


@@ -271,115 +271,104 @@ wxRegionGeneric::wxRegionGeneric(const wxPoint& topLeft, const wxPoint& bottomRi
     m_refData = new wxRegionRefData(topLeft, bottomRight);
 }
 
     m_refData = new wxRegionRefData(topLeft, bottomRight);
 }
 

+wxRegionGeneric::wxRegionGeneric(const wxBitmap& bmp)
+{
+    wxFAIL_MSG("NOT IMPLEMENTED: wxRegionGeneric::wxRegionGeneric(const wxBitmap& bmp)");
+}
+
+wxRegionGeneric::wxRegionGeneric(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle)
+{
+    wxFAIL_MSG("NOT IMPLEMENTED: wxRegionGeneric::wxRegionGeneric(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle)");
+}
+
+wxRegionGeneric::wxRegionGeneric(const wxBitmap& bmp, const wxColour& transp, int tolerance)
+{
+    wxFAIL_MSG("NOT IMPLEMENTED: wxRegionGeneric::wxRegionGeneric(const wxBitmap& bmp, const wxColour& transp, int tolerance)");
+}
+

 void wxRegionGeneric::Clear()
 {
     UnRef();
 void wxRegionGeneric::Clear()
 {
     UnRef();

+    if (!m_refData)
+        m_refData = new wxRegionRefData(wxRect(0,0,0,0));

 }
 
 }
 

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

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

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

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

-bool wxRegionGeneric::operator== (const wxRegionGeneric& region) const
+bool wxRegionGeneric::DoIsEqual(const wxRegion& region) const

 {
 {

-    wxASSERT(m_refData && region.m_refData);

     return REGION::XEqualRegion(M_REGIONDATA,M_REGIONDATA_OF(region));
 }
 
     return REGION::XEqualRegion(M_REGIONDATA,M_REGIONDATA_OF(region));
 }
 

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

 {
 {

-    wxASSERT(m_refData);
-    wxRect rect;
-    REGION::XClipBox(M_REGIONDATA,&rect);
-    return rect;
-}
+    if ( !m_refData )
+        return false;

 
 

-void wxRegionGeneric::GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const
-{
-    wxASSERT(m_refData);

     wxRect rect;
     REGION::XClipBox(M_REGIONDATA,&rect);
     x = rect.x;
     y = rect.y;
     w = rect.width;
     h = rect.height;
     wxRect rect;
     REGION::XClipBox(M_REGIONDATA,&rect);
     x = rect.x;
     y = rect.y;
     w = rect.width;
     h = rect.height;

+    return true;

 }
 
 // ----------------------------------------------------------------------------
 // wxRegionGeneric operations
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxRegionGeneric operations
 // ----------------------------------------------------------------------------
 

-bool wxRegionGeneric::Union(const wxRect& rect)
-/* XUnionRectWithRegion */
+bool wxRegionGeneric::DoUnionWithRect(const wxRect& rect)

 {
 {

-    if (!rect.width || !rect.height)
-        return false;
+    if ( rect.IsEmpty() )
+    {
+        // nothing to do
+        return true;
+    }

 
     AllocExclusive();
     REGION region(rect);
     return REGION::XUnionRegion(&region,M_REGIONDATA,M_REGIONDATA);
 }
 
 
     AllocExclusive();
     REGION region(rect);
     return REGION::XUnionRegion(&region,M_REGIONDATA,M_REGIONDATA);
 }
 

-bool wxRegionGeneric::Union(const wxRegionGeneric& region)
+bool wxRegionGeneric::DoUnionWithRegion(const wxRegion& region)

 {
     AllocExclusive();
     return REGION::XUnionRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA);
 }
 
 {
     AllocExclusive();
     return REGION::XUnionRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA);
 }
 

-bool wxRegionGeneric::Intersect(const wxRect& rect)
-{
-    if (!rect.width || !rect.height)
-        return false;
-    AllocExclusive();
-    REGION region(rect);
-
-    return REGION::XIntersectRegion(&region,M_REGIONDATA,M_REGIONDATA);
-}
-
-bool wxRegionGeneric::Intersect(const wxRegionGeneric& region)
+bool wxRegionGeneric::DoIntersect(const wxRegion& region)

 {
     AllocExclusive();
     return REGION::XIntersectRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA);
 }
 
 {
     AllocExclusive();
     return REGION::XIntersectRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA);
 }
 

-bool wxRegionGeneric::Subtract(const wxRect& rect)
+bool wxRegionGeneric::DoSubtract(const wxRegion& region)

 {
 {

-    if (!rect.width || !rect.height)
-        return false;
-    AllocExclusive();
-    REGION region(rect);
-
-    return REGION::XSubtractRegion(&region,M_REGIONDATA,M_REGIONDATA);
-}
+    if ( region.IsEmpty() )
+    {
+        // nothing to do
+        return true;
+    }

 
 

-bool wxRegionGeneric::Subtract(const wxRegionGeneric& region)
-{

     return REGION::XSubtractRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA);
 }
 
     return REGION::XSubtractRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA);
 }
 

-bool wxRegionGeneric::Xor(const wxRect& rect)
-{
-    if (!rect.width || !rect.height)
-        return false;
-    AllocExclusive();
-    REGION region(rect);
-
-    return REGION::XXorRegion(&region,M_REGIONDATA,M_REGIONDATA);
-}
-
-bool wxRegionGeneric::Xor(const wxRegionGeneric& region)
+bool wxRegionGeneric::DoXor(const wxRegion& region)

 {
     AllocExclusive();
     return REGION::XXorRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA);
 }
 
 {
     AllocExclusive();
     return REGION::XXorRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA);
 }
 

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

 {
     AllocExclusive();
     return REGION::XOffsetRegion(M_REGIONDATA, x, y);
 {
     AllocExclusive();
     return REGION::XOffsetRegion(M_REGIONDATA, x, y);


@@ -389,35 +378,21 @@ bool wxRegionGeneric::Offset(wxCoord x, wxCoord y)
 // wxRegionGeneric comparison
 // ----------------------------------------------------------------------------
 
 // wxRegionGeneric comparison
 // ----------------------------------------------------------------------------
 

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

 {
     wxASSERT(m_refData);
     return REGION::XEmptyRegion(M_REGIONDATA);
 }
 
 // Does the region contain the point (x,y)?
 {
     wxASSERT(m_refData);
     return REGION::XEmptyRegion(M_REGIONDATA);
 }
 
 // Does the region contain the point (x,y)?

-wxRegionContain wxRegionGeneric::Contains(long x, long y) const
-{
-    wxASSERT(m_refData);
-    return REGION::XPointInRegion(M_REGIONDATA,x,y)?wxInRegion:wxOutRegion;
-}
-
-// Does the region contain the point pt?
-wxRegionContain wxRegionGeneric::Contains(const wxPoint& pt) const
-{
-    wxASSERT(m_refData);
-    return REGION::XPointInRegion(M_REGIONDATA,pt.x,pt.y)?wxInRegion:wxOutRegion;
-}
-
-// Does the region contain the rectangle (x, y, w, h)?
-wxRegionContain wxRegionGeneric::Contains(long x, long y, long w, long h) const
+wxRegionContain wxRegionGeneric::DoContainsPoint(wxCoord x, wxCoord y) const

 {
     wxASSERT(m_refData);
 {
     wxASSERT(m_refData);

-    return REGION::XRectInRegion(M_REGIONDATA,x,y,w,h);
+    return REGION::XPointInRegion(M_REGIONDATA,x,y) ? wxInRegion : wxOutRegion;

 }
 
 // Does the region contain the rectangle rect?
 }
 
 // Does the region contain the rectangle rect?

-wxRegionContain wxRegionGeneric::Contains(const wxRect& rect) const
+wxRegionContain wxRegionGeneric::DoContainsRect(const wxRect& rect) const

 {
     wxASSERT(m_refData);
     return REGION::XRectInRegion(M_REGIONDATA,rect.x,rect.y,rect.width,rect.height);
 {
     wxASSERT(m_refData);
     return REGION::XRectInRegion(M_REGIONDATA,rect.x,rect.y,rect.width,rect.height);


@@ -642,7 +617,7 @@ Region REGION::XCreateRegion(void)
 
     if (!temp->rects)
     {
 
     if (!temp->rects)
     {

-        free((char *) temp);
+        delete temp;

         return (Region) NULL;
     }
     temp->numRects = 0;
         return (Region) NULL;
     }
     temp->numRects = 0;


@@ -710,7 +685,7 @@ miSetExtents (Region pReg)
     pExtents->x2 = pBoxEnd->x2;
     pExtents->y2 = pBoxEnd->y2;
 
     pExtents->x2 = pBoxEnd->x2;
     pExtents->y2 = pBoxEnd->y2;
 

-    assert(pExtents->y1 < pExtents->y2);
+    wxASSERT_LEVEL_2(pExtents->y1 < pExtents->y2);

     while (pBox <= pBoxEnd)
     {
         if (pBox->x1 < pExtents->x1)
     while (pBox <= pBoxEnd)
     {
         if (pBox->x1 < pExtents->x1)


@@ -723,7 +698,7 @@ miSetExtents (Region pReg)
         }
         pBox++;
     }
         }
         pBox++;
     }

-    assert(pExtents->x1 < pExtents->x2);
+    wxASSERT_LEVEL_2(pExtents->x1 < pExtents->x2);

 }
 
 bool REGION::
 }
 
 bool REGION::


@@ -814,7 +789,7 @@ miIntersectO (
          */
         if (x1 < x2)
         {
          */
         if (x1 < x2)
         {

-            assert(y1<y2);
+            wxASSERT_LEVEL_2(y1<y2);

 
             MEMCHECK(pReg, pNextRect, pReg->rects);
             pNextRect->x1 = x1;
 
             MEMCHECK(pReg, pNextRect, pReg->rects);
             pNextRect->x1 = x1;


@@ -823,7 +798,7 @@ miIntersectO (
             pNextRect->y2 = y2;
             pReg->numRects += 1;
             pNextRect++;
             pNextRect->y2 = y2;
             pReg->numRects += 1;
             pNextRect++;

-            assert(pReg->numRects <= pReg->size);
+            wxASSERT_LEVEL_2(pReg->numRects <= pReg->size);

         }
 
         /*
         }
 
         /*


@@ -1404,11 +1379,11 @@ miUnionNonO (
 
     pNextRect = &pReg->rects[pReg->numRects];
 
 
     pNextRect = &pReg->rects[pReg->numRects];
 

-    assert(y1 < y2);
+    wxASSERT_LEVEL_2(y1 < y2);

 
     while (r != rEnd)
     {
 
     while (r != rEnd)
     {

-        assert(r->x1 < r->x2);
+        wxASSERT_LEVEL_2(r->x1 < r->x2);

         MEMCHECK(pReg, pNextRect, pReg->rects);
         pNextRect->x1 = r->x1;
         pNextRect->y1 = y1;
         MEMCHECK(pReg, pNextRect, pReg->rects);
         pNextRect->x1 = r->x1;
         pNextRect->y1 = y1;


@@ -1417,7 +1392,7 @@ miUnionNonO (
         pReg->numRects += 1;
         pNextRect++;
 
         pReg->numRects += 1;
         pNextRect++;
 

-        assert(pReg->numRects<=pReg->size);
+        wxASSERT_LEVEL_2(pReg->numRects<=pReg->size);

         r++;
     }
     return 0;        /* lint */
         r++;
     }
     return 0;        /* lint */


@@ -1464,7 +1439,7 @@ miUnionO (
         if (pNextRect[-1].x2 < r->x2)  \
         {  \
             pNextRect[-1].x2 = r->x2;  \
         if (pNextRect[-1].x2 < r->x2)  \
         {  \
             pNextRect[-1].x2 = r->x2;  \

-            assert(pNextRect[-1].x1<pNextRect[-1].x2); \
+            wxASSERT_LEVEL_2(pNextRect[-1].x1<pNextRect[-1].x2); \

         }  \
     }  \
     else  \
         }  \
     }  \
     else  \


@@ -1477,10 +1452,10 @@ miUnionO (
         pReg->numRects += 1;  \
         pNextRect += 1;  \
     }  \
         pReg->numRects += 1;  \
         pNextRect += 1;  \
     }  \

-    assert(pReg->numRects<=pReg->size);\
+    wxASSERT_LEVEL_2(pReg->numRects<=pReg->size);\

     r++;
 
     r++;
 

-    assert (y1<y2);
+    wxASSERT_LEVEL_2 (y1<y2);

     while ((r1 != r1End) && (r2 != r2End))
     {
         if (r1->x1 < r2->x1)
     while ((r1 != r1End) && (r2 != r2End))
     {
         if (r1->x1 < r2->x1)


@@ -1605,11 +1580,11 @@ miSubtractNonO1 (
 
     pNextRect = &pReg->rects[pReg->numRects];
 
 
     pNextRect = &pReg->rects[pReg->numRects];
 

-    assert(y1<y2);
+    wxASSERT_LEVEL_2(y1<y2);

 
     while (r != rEnd)
     {
 
     while (r != rEnd)
     {

-        assert(r->x1<r->x2);
+        wxASSERT_LEVEL_2(r->x1<r->x2);

         MEMCHECK(pReg, pNextRect, pReg->rects);
         pNextRect->x1 = r->x1;
         pNextRect->y1 = y1;
         MEMCHECK(pReg, pNextRect, pReg->rects);
         pNextRect->x1 = r->x1;
         pNextRect->y1 = y1;


@@ -1618,7 +1593,7 @@ miSubtractNonO1 (
         pReg->numRects += 1;
         pNextRect++;
 
         pReg->numRects += 1;
         pNextRect++;
 

-        assert(pReg->numRects <= pReg->size);
+        wxASSERT_LEVEL_2(pReg->numRects <= pReg->size);

 
         r++;
     }
 
         r++;
     }


@@ -1655,7 +1630,7 @@ miSubtractO (
 
     x1 = r1->x1;
 
 
     x1 = r1->x1;
 

-    assert(y1<y2);
+    wxASSERT_LEVEL_2(y1<y2);

     pNextRect = &pReg->rects[pReg->numRects];
 
     while ((r1 != r1End) && (r2 != r2End))
     pNextRect = &pReg->rects[pReg->numRects];
 
     while ((r1 != r1End) && (r2 != r2End))


@@ -1698,7 +1673,7 @@ miSubtractO (
              * Left part of subtrahend covers part of minuend: add uncovered
              * part of minuend to region and skip to next subtrahend.
              */
              * Left part of subtrahend covers part of minuend: add uncovered
              * part of minuend to region and skip to next subtrahend.
              */

-            assert(x1<r2->x1);
+            wxASSERT_LEVEL_2(x1<r2->x1);

             MEMCHECK(pReg, pNextRect, pReg->rects);
             pNextRect->x1 = x1;
             pNextRect->y1 = y1;
             MEMCHECK(pReg, pNextRect, pReg->rects);
             pNextRect->x1 = x1;
             pNextRect->y1 = y1;


@@ -1707,7 +1682,7 @@ miSubtractO (
             pReg->numRects += 1;
             pNextRect++;
 
             pReg->numRects += 1;
             pNextRect++;
 

-            assert(pReg->numRects<=pReg->size);
+            wxASSERT_LEVEL_2(pReg->numRects<=pReg->size);

 
             x1 = r2->x2;
             if (x1 >= r1->x2)
 
             x1 = r2->x2;
             if (x1 >= r1->x2)


@@ -1741,7 +1716,7 @@ miSubtractO (
                 pNextRect->y2 = y2;
                 pReg->numRects += 1;
                 pNextRect++;
                 pNextRect->y2 = y2;
                 pReg->numRects += 1;
                 pNextRect++;

-                assert(pReg->numRects<=pReg->size);
+                wxASSERT_LEVEL_2(pReg->numRects<=pReg->size);

             }
             r1++;
             if (r1 != r1End)
             }
             r1++;
             if (r1 != r1End)


@@ -1754,7 +1729,7 @@ miSubtractO (
      */
     while (r1 != r1End)
     {
      */
     while (r1 != r1End)
     {

-        assert(x1<r1->x2);
+        wxASSERT_LEVEL_2(x1<r1->x2);

         MEMCHECK(pReg, pNextRect, pReg->rects);
         pNextRect->x1 = x1;
         pNextRect->y1 = y1;
         MEMCHECK(pReg, pNextRect, pReg->rects);
         pNextRect->x1 = x1;
         pNextRect->y1 = y1;


@@ -1763,7 +1738,7 @@ miSubtractO (
         pReg->numRects += 1;
         pNextRect++;
 
         pReg->numRects += 1;
         pNextRect++;
 

-        assert(pReg->numRects<=pReg->size);
+        wxASSERT_LEVEL_2(pReg->numRects<=pReg->size);

 
         r1++;
         if (r1 != r1End)
 
         r1++;
         if (r1 != r1End)