/////////////////////////////////////////////////////////////////////////////
-// 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 Vaclav Slavik
+// 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"
+ #include "wx/module.h"
+#endif
+
#include "wx/thread.h"
#include <mgraph.hpp>
class WXDLLEXPORT wxRegionRefData : public wxGDIRefData
{
public:
- wxRegionRefData()
- {
- }
+ wxRegionRefData() {}
wxRegionRefData(const wxRegionRefData& data)
{
m_region = data.m_region;
}
- ~wxRegionRefData()
- {
- }
+ virtual ~wxRegionRefData() {}
MGLRegion m_region;
};
// wxRegion
//-----------------------------------------------------------------------------
+wxObjectRefData *wxRegion::CreateRefData() const
+{
+ return new wxRegionRefData;
+}
+
+wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
+{
+ return new wxRegionRefData(*(wxRegionRefData *)data);
+}
+
/*
* Create an empty region.
*/
wxRegion::wxRegion()
{
- m_refData = (wxRegionRefData *)NULL;
+ m_refData = NULL;
}
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;
wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
{
m_refData = new wxRegionRefData;
- MGLRect rect(topLeft.x, topLeft.y, bottomRight.x, bottomRight.y);
+ MGLRect rect(topLeft.x, topLeft.y, bottomRight.x+1, bottomRight.y+1);
M_REGION = rect;
}
wxRegion::wxRegion(const wxRect& r)
{
m_refData = new wxRegionRefData;
- MGLRect rect(r.GetLeft(), r.GetTop(), r.GetRight(), r.GetBottom());
+ MGLRect rect(r.GetLeft(), r.GetTop(), r.GetRight()+1, r.GetBottom()+1);
M_REGION = rect;
}
// 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();
y = rect.top;
w = rect.right - rect.left;
h = rect.bottom - rect.top;
- }
- else
+ }
+ else
{
x = y = w = h = 0;
}
// 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());
}
//-----------------------------------------------------------------------------
// Modifications
//-----------------------------------------------------------------------------
+bool wxRegion::Offset(wxCoord x, wxCoord y)
+{
+ AllocExclusive();
+ M_REGION.offset(x, y);
+ return true;
+}
+
// Union rectangle or region with this.
bool wxRegion::Union(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
- Unshare();
+ AllocExclusive();
M_REGION += MGLRect(x, y, x + width, y + height);
- return TRUE;
+ return true;
}
bool wxRegion::Union(const wxRegion& region)
{
- Unshare();
+ 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)
{
- Unshare();
+ AllocExclusive();
M_REGION &= MGLRect(x, y, x + width, y + height);
- return TRUE;
+ return true;
}
bool wxRegion::Intersect(const wxRegion& region)
{
- Unshare();
+ 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)
{
- Unshare();
+ AllocExclusive();
M_REGION -= MGLRect(x, y, x + width, y + height);
- return TRUE;
+ return true;
}
bool wxRegion::Subtract(const wxRegion& region)
{
- Unshare();
+ 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)
{
- Unshare();
+ AllocExclusive();
MGLRect rect(x, y, x + width, y + height);
MGLRegion rg1 = M_REGION + rect,
rg2 = M_REGION & rect;
M_REGION = rg1 - rg2;
- return TRUE;
+ return true;
}
bool wxRegion::Xor(const wxRegion& region)
{
- Unshare();
+ AllocExclusive();
MGLRegion rg1 = M_REGION + M_REGION_OF(region),
rg2 = M_REGION & M_REGION_OF(region);
M_REGION = rg1 - rg2;
- return TRUE;
+ return true;
}
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;
}
+///////////////////////////////////////////////////////////////////////////////
+// wxRegionIterator //
+///////////////////////////////////////////////////////////////////////////////
+
+#if wxUSE_THREADS
+static wxMutex *gs_mutexIterator;
-void wxRegion::Unshare()
+class wxMglRegionModule : public wxModule
{
- if (!m_refData)
+public:
+ virtual bool OnInit()
{
- m_refData = new wxRegionRefData();
+ gs_mutexIterator = new wxMutex();
+ return true;
}
- else
+ virtual void OnExit()
{
- wxRegionRefData* ref = new wxRegionRefData(*(wxRegionRefData*)m_refData);
- UnRef();
- m_refData = ref;
+ wxDELETE(gs_mutexIterator);
}
-}
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////
-// wxRegionIterator //
-///////////////////////////////////////////////////////////////////////////////
+ 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()
*/
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 wxMGL_region_callback(const rect_t *r)
+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;
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();
}
}
else
return 0;
}
-
projects / wxWidgets.git / blobdiff