X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d7ee9e860187240a5f82ec4489c831f894065f2..89579a60d7ba7da32777647ad7647af69ec4e687:/src/mgl/region.cpp?ds=sidebyside

diff --git a/src/mgl/region.cpp b/src/mgl/region.cpp
index a3f2b9b0c6..36d60598d7 100644
--- a/src/mgl/region.cpp
+++ b/src/mgl/region.cpp
@@ -1,26 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:      region.cpp
-// Purpose:   Region handling for wxWindows/MGL
+// Name:      src/mgl/region.cpp
+// Purpose:   Region handling for wxWidgets/MGL
 // Author:    Vaclav Slavik
 // RCS-ID:    $Id$
-// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "region.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #include "wx/region.h"
-#include "wx/gdicmn.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+
 #include "wx/thread.h"
+#include "wx/module.h"
 
 #include <mgraph.hpp>
 
@@ -75,7 +76,7 @@ wxRegion::wxRegion()
 }
 
 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;
@@ -129,7 +130,7 @@ void wxRegion::Clear()
 // Outer bounds of region
 void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const
 {
-    if (m_refData) 
+    if (m_refData)
     {
         rect_t rect;
         rect = M_REGION.getBounds();
@@ -137,8 +138,8 @@ 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;
-    } 
-    else 
+    }
+    else
     {
         x = y = w = h = 0;
     }
@@ -154,8 +155,10 @@ wxRect wxRegion::GetBox() const
 // Is region empty?
 bool wxRegion::Empty() const
 {
-    if (!m_refData) return TRUE;
-    return M_REGION.isEmpty();
+    if (!m_refData)
+        return true;
+
+    return (bool)(M_REGION.isEmpty());
 }
 
 //-----------------------------------------------------------------------------
@@ -166,7 +169,7 @@ bool wxRegion::Offset(wxCoord x, wxCoord y)
 {
     AllocExclusive();
     M_REGION.offset(x, y);
-    return TRUE;
+    return true;
 }
 
 // Union rectangle or region with this.
@@ -174,14 +177,14 @@ bool wxRegion::Union(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
     AllocExclusive();
     M_REGION += MGLRect(x, y, x + width, y + height);
-    return TRUE;
+    return true;
 }
 
 bool wxRegion::Union(const wxRegion& region)
 {
     AllocExclusive();
     M_REGION += M_REGION_OF(region);
-    return TRUE;
+    return true;
 }
 
 // Intersect rectangle or region with this.
@@ -189,14 +192,14 @@ bool wxRegion::Intersect(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
     AllocExclusive();
     M_REGION &= MGLRect(x, y, x + width, y + height);
-    return TRUE;
+    return true;
 }
 
 bool wxRegion::Intersect(const wxRegion& region)
 {
     AllocExclusive();
     M_REGION &= M_REGION_OF(region);
-    return TRUE;
+    return true;
 }
 
 // Subtract rectangle or region from this:
@@ -205,14 +208,14 @@ bool wxRegion::Subtract(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
     AllocExclusive();
     M_REGION -= MGLRect(x, y, x + width, y + height);
-    return TRUE;
+    return true;
 }
 
 bool wxRegion::Subtract(const wxRegion& region)
 {
     AllocExclusive();
     M_REGION -= M_REGION_OF(region);
-    return TRUE;
+    return true;
 }
 
 // XOR: the union of two combined regions except for any overlapping areas.
@@ -223,7 +226,7 @@ bool wxRegion::Xor(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
     MGLRegion rg1 = M_REGION + rect,
               rg2 = M_REGION & rect;
     M_REGION = rg1 - rg2;
-    return TRUE;    
+    return true;
 }
 
 bool wxRegion::Xor(const wxRegion& region)
@@ -232,7 +235,7 @@ bool wxRegion::Xor(const wxRegion& region)
     MGLRegion rg1 = M_REGION + M_REGION_OF(region),
               rg2 = M_REGION & M_REGION_OF(region);
     M_REGION = rg1 - rg2;
-    return TRUE;
+    return true;
 }
 
 
@@ -266,11 +269,11 @@ wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) c
 
     MGLRect rect(x, y, x + w, y + h);
     MGLRegion rg;
-    
+
     // 1) is the rectangle entirely covered by the region?
     rg = MGLRegion(rect) - M_REGION;
     if (rg.isEmpty()) return wxInRegion;
-    
+
     // 2) is the rectangle completely outside the region?
     rg = M_REGION & rect; // intersection
     if (rg.isEmpty()) return wxOutRegion;
@@ -290,12 +293,33 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const
 //                               wxRegionIterator                                 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#if wxUSE_THREADS
+static wxMutex *gs_mutexIterator;
+
+class wxMglRegionModule : public wxModule
+{
+public:
+    virtual bool OnInit()
+    {
+        gs_mutexIterator = new wxMutex();
+        return true;
+    }
+    virtual void OnExit()
+    {
+        wxDELETE(gs_mutexIterator);
+    }
+
+    DECLARE_DYNAMIC_CLASS(wxMglRegionModule)
+};
+IMPLEMENT_DYNAMIC_CLASS(wxMglRegionModule, wxModule)
+#endif
+
 /*
  * Initialize empty iterator
  */
 wxRegionIterator::wxRegionIterator() : m_currentNode(NULL)
 {
-    m_rects.DeleteContents(TRUE);
+    m_rects.DeleteContents(true);
 }
 
 wxRegionIterator::~wxRegionIterator()
@@ -307,23 +331,23 @@ wxRegionIterator::~wxRegionIterator()
  */
 wxRegionIterator::wxRegionIterator(const wxRegion& region)
 {
-    m_rects.DeleteContents(TRUE);
+    m_rects.DeleteContents(true);
     Reset(region);
 }
 
 /*
  * Reset iterator for a new /e region.
  */
- 
+
 
 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));
 }
- 
+
 void wxRegionIterator::Reset(const wxRegion& region)
 {
     m_currentNode = NULL;
@@ -331,10 +355,11 @@ void wxRegionIterator::Reset(const wxRegion& region)
 
     if (!region.Empty())
     {
-        wxMutexGuiEnter();
+#if wxUSE_THREADS
+        wxMutexLocker lock(*gs_mutexIterator);
+#endif
         gs_rectList = &m_rects;
         M_REGION_OF(region).traverse(wxMGL_region_callback);
-        wxMutexGuiLeave();
         m_currentNode = m_rects.GetFirst();
     }
 }