Warning fix.

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

diff --git a/src/mgl/region.cpp b/src/mgl/region.cpp
index 94a66c8eee28e21cc7c6a4969c9d48150f95b32d..f2778ffa9973fca75572b380f1f086688372c858 100644 (file)
--- a/src/mgl/region.cpp
+++ b/src/mgl/region.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:      region.cpp
+// Name:      src/mgl/region.cpp

 // Purpose:   Region handling for wxWidgets/MGL
 // Author:    Vaclav Slavik
 // RCS-ID:    $Id$
 // Purpose:   Region handling for wxWidgets/MGL
 // Author:    Vaclav Slavik
 // RCS-ID:    $Id$


@@ -11,13 +11,17 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

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

-#include "wx/gdicmn.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+    #include "wx/module.h"
+#endif
+

 #include "wx/thread.h"
 #include "wx/thread.h"

-#include "wx/module.h"

 
 #include <mgraph.hpp>
 
 
 #include <mgraph.hpp>
 


@@ -41,7 +45,7 @@ public:
         m_region = data.m_region;
     }
 
         m_region = data.m_region;
     }
 

-    ~wxRegionRefData() {}
+    virtual ~wxRegionRefData() {}

 
     MGLRegion m_region;
 };
 
     MGLRegion m_region;
 };


@@ -72,7 +76,7 @@ wxRegion::wxRegion()
 }
 
 wxRegion::wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
 }
 
 wxRegion::wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)

-{    
+{

     m_refData = new wxRegionRefData;
     MGLRect rect(x, y, x + w, y + h);
     M_REGION = rect;
     m_refData = new wxRegionRefData;
     MGLRect rect(x, y, x + w, y + h);
     M_REGION = rect;


@@ -123,10 +127,17 @@ void wxRegion::Clear()
 // Information on region
 //-----------------------------------------------------------------------------
 
 // Information on region
 //-----------------------------------------------------------------------------
 

+bool wxRegion::DoIsEqual(const wxRegion& region) const
+{
+    wxFAIL_MSG( _T("not implemented") );
+
+    return false;
+}
+

 // Outer bounds of region
 // 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)

     {
         rect_t rect;
         rect = M_REGION.getBounds();
     {
         rect_t rect;
         rect = M_REGION.getBounds();


@@ -134,102 +145,72 @@ 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;

-    } 
-    else 
+
+        return true;
+    }
+    else

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

+        return false;

     }
 }
 
     }
 }
 

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

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

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

 {
 {

-    if (!m_refData) return TRUE;
-    return M_REGION.isEmpty();
+    if (!m_refData)
+        return true;
+
+    return (bool)(M_REGION.isEmpty());

 }
 
 //-----------------------------------------------------------------------------
 // Modifications
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // Modifications
 //-----------------------------------------------------------------------------
 

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

 {
     AllocExclusive();
     M_REGION.offset(x, y);
 {
     AllocExclusive();
     M_REGION.offset(x, y);

-    return TRUE;
+    return true;

 }
 
 // Union rectangle or region with this.
 }
 
 // Union rectangle or region with this.

-bool wxRegion::Union(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+bool wxRegion::DoUnionWithRect(const wxRect& r)

 {
     AllocExclusive();
 {
     AllocExclusive();

-    M_REGION += MGLRect(x, y, x + width, y + height);
-    return TRUE;
+    M_REGION += MGLRect(r.x, r.y, r.GetRight() + 1, r.GetHeight() + 1);
+    return true;

 }
 
 }
 

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

 {
     AllocExclusive();
     M_REGION += M_REGION_OF(region);
 {
     AllocExclusive();
     M_REGION += M_REGION_OF(region);

-    return TRUE;
+    return true;

 }
 
 }
 

-// Intersect rectangle or region with this.
-bool wxRegion::Intersect(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-{
-    AllocExclusive();
-    M_REGION &= MGLRect(x, y, x + width, y + height);
-    return TRUE;
-}
-
-bool wxRegion::Intersect(const wxRegion& region)
+bool wxRegion::DoIntersect(const wxRegion& region)

 {
     AllocExclusive();
     M_REGION &= M_REGION_OF(region);
 {
     AllocExclusive();
     M_REGION &= M_REGION_OF(region);

-    return TRUE;
+    return true;

 }
 
 }
 

-// Subtract rectangle or region from this:
-// Combines the parts of 'this' that are not part of the second region.
-bool wxRegion::Subtract(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-{
-    AllocExclusive();
-    M_REGION -= MGLRect(x, y, x + width, y + height);
-    return TRUE;
-}
-
-bool wxRegion::Subtract(const wxRegion& region)
+bool wxRegion::DoSubtract(const wxRegion& region)

 {
     AllocExclusive();
     M_REGION -= M_REGION_OF(region);
 {
     AllocExclusive();
     M_REGION -= M_REGION_OF(region);

-    return TRUE;
+    return true;

 }
 
 }
 

-// XOR: the union of two combined regions except for any overlapping areas.
-bool wxRegion::Xor(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-{
-    AllocExclusive();
-    MGLRect rect(x, y, x + width, y + height);
-    MGLRegion rg1 = M_REGION + rect,
-              rg2 = M_REGION & rect;
-    M_REGION = rg1 - rg2;
-    return TRUE;    
-}
-
-bool wxRegion::Xor(const wxRegion& region)
+bool wxRegion::DoXor(const wxRegion& region)

 {
     AllocExclusive();
     MGLRegion rg1 = M_REGION + M_REGION_OF(region),
               rg2 = M_REGION & M_REGION_OF(region);
     M_REGION = rg1 - rg2;
 {
     AllocExclusive();
     MGLRegion rg1 = M_REGION + M_REGION_OF(region),
               rg2 = M_REGION & M_REGION_OF(region);
     M_REGION = rg1 - rg2;

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -238,7 +219,7 @@ bool wxRegion::Xor(const wxRegion& region)
 //-----------------------------------------------------------------------------
 
 // Does the region contain the point (x,y)?
 //-----------------------------------------------------------------------------
 
 // 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;


@@ -249,40 +230,29 @@ wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y) const
         return wxOutRegion;
 }
 
         return 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& r) const

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

-    MGLRect rect(x, y, x + w, y + h);
+    MGLRect rect(r.x, r.y, r.GetRight() + 1, r.GetBottom() + 1);

     MGLRegion rg;
     MGLRegion rg;

-    
+

     // 1) is the rectangle entirely covered by the region?
     rg = MGLRegion(rect) - M_REGION;
     // 1) is the rectangle entirely covered by the region?
     rg = MGLRegion(rect) - M_REGION;

-    if (rg.isEmpty()) return wxInRegion;
-    
+    if (rg.isEmpty())
+        return wxInRegion;
+

     // 2) is the rectangle completely outside the region?
     rg = M_REGION & rect; // intersection
     // 2) is the rectangle completely outside the region?
     rg = M_REGION & rect; // intersection

-    if (rg.isEmpty()) return wxOutRegion;
+    if (rg.isEmpty())
+        return wxOutRegion;

 
     // 3) neither case happened => it is partially covered:
     return wxPartRegion;
 }
 
 
     // 3) neither case happened => it is partially covered:
     return wxPartRegion;
 }
 

-// Does the region contain the rectangle rect
-wxRegionContain wxRegion::Contains(const wxRect& rect) const
-{
-    return Contains(rect.x, rect.y, rect.width, rect.height);
-}
-
-

 ///////////////////////////////////////////////////////////////////////////////
 //                               wxRegionIterator                                 //
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 //                               wxRegionIterator                                 //
 ///////////////////////////////////////////////////////////////////////////////


@@ -296,7 +266,7 @@ public:
     virtual bool OnInit()
     {
         gs_mutexIterator = new wxMutex();
     virtual bool OnInit()
     {
         gs_mutexIterator = new wxMutex();

-        return TRUE;
+        return true;

     }
     virtual void OnExit()
     {
     }
     virtual void OnExit()
     {


@@ -313,7 +283,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMglRegionModule, wxModule)
  */
 wxRegionIterator::wxRegionIterator() : m_currentNode(NULL)
 {
  */
 wxRegionIterator::wxRegionIterator() : m_currentNode(NULL)
 {

-    m_rects.DeleteContents(TRUE);
+    m_rects.DeleteContents(true);

 }
 
 wxRegionIterator::~wxRegionIterator()
 }
 
 wxRegionIterator::~wxRegionIterator()


@@ -325,23 +295,23 @@ wxRegionIterator::~wxRegionIterator()
  */
 wxRegionIterator::wxRegionIterator(const wxRegion& region)
 {
  */
 wxRegionIterator::wxRegionIterator(const wxRegion& region)
 {

-    m_rects.DeleteContents(TRUE);
+    m_rects.DeleteContents(true);

     Reset(region);
 }
 
 /*
  * Reset iterator for a new /e region.
  */
     Reset(region);
 }
 
 /*
  * Reset iterator for a new /e region.
  */

- 
+

 
 static wxRegionRectList *gs_rectList;
 
 static void MGLAPI wxMGL_region_callback(const rect_t *r)
 {
 
 static wxRegionRectList *gs_rectList;
 
 static void MGLAPI wxMGL_region_callback(const rect_t *r)
 {

-    gs_rectList->Append(new wxRect(r->left, r->top, 
+    gs_rectList->Append(new wxRect(r->left, r->top,

                                    r->right - r->left, r->bottom - r->top));
 }
                                    r->right - r->left, r->bottom - r->top));
 }

- 
+

 void wxRegionIterator::Reset(const wxRegion& region)
 {
     m_currentNode = NULL;
 void wxRegionIterator::Reset(const wxRegion& region)
 {
     m_currentNode = NULL;


@@ -350,7 +320,7 @@ void wxRegionIterator::Reset(const wxRegion& region)
     if (!region.Empty())
     {
 #if wxUSE_THREADS
     if (!region.Empty())
     {
 #if wxUSE_THREADS

-        wxMutexLocker(*gs_mutexIterator);
+        wxMutexLocker lock(*gs_mutexIterator);

 #endif
         gs_rectList = &m_rects;
         M_REGION_OF(region).traverse(wxMGL_region_callback);
 #endif
         gs_rectList = &m_rects;
         M_REGION_OF(region).traverse(wxMGL_region_callback);