wxCocoa: wxRegion using wxRegionGeneric
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
parent
4c3c384448
commit
53dbce2338
@ -1885,7 +1885,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/cocoa/pen.mm
|
||||
src/cocoa/radiobox.mm
|
||||
src/cocoa/radiobut.mm
|
||||
src/cocoa/region.cpp
|
||||
src/cocoa/region.mm
|
||||
src/cocoa/settings.cpp
|
||||
src/cocoa/slider.mm
|
||||
src/cocoa/spinbutt.mm
|
||||
@ -1911,6 +1911,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/generic/listctrl.cpp
|
||||
src/generic/msgdlgg.cpp
|
||||
src/generic/paletteg.cpp
|
||||
src/generic/regiong.cpp
|
||||
src/generic/statusbr.cpp
|
||||
src/generic/tabg.cpp
|
||||
src/generic/timer.cpp
|
||||
@ -1986,6 +1987,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/generic/imaglist.h
|
||||
wx/generic/listctrl.h
|
||||
wx/generic/paletteg.h
|
||||
wx/generic/region.h
|
||||
wx/generic/statusbr.h
|
||||
wx/generic/tabg.h
|
||||
</set>
|
||||
|
||||
@ -1,179 +1,85 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: region.h
|
||||
// Name: wx/cocoa/region.h
|
||||
// Purpose: wxRegion class
|
||||
// Author: AUTHOR
|
||||
// Modified by:
|
||||
// Created: ??/??/98
|
||||
// Author: David Elliott
|
||||
// Modified by:
|
||||
// Created: 2004/04/12
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) AUTHOR
|
||||
// Copyright: (c) 2004 David Elliott
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_REGION_H_
|
||||
#define _WX_REGION_H_
|
||||
#ifndef _WX_COCOA_REGION_H__
|
||||
#define _WX_COCOA_REGION_H__
|
||||
|
||||
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
||||
#pragma interface "region.h"
|
||||
#endif
|
||||
#include "wx/generic/region.h"
|
||||
|
||||
#include "wx/list.h"
|
||||
#include "wx/gdiobj.h"
|
||||
#include "wx/gdicmn.h"
|
||||
|
||||
class WXDLLEXPORT wxRect;
|
||||
class WXDLLEXPORT wxPoint;
|
||||
|
||||
enum wxRegionContain {
|
||||
wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
|
||||
};
|
||||
|
||||
// So far, for internal use only
|
||||
enum wxRegionOp {
|
||||
wxRGN_AND, // Creates the intersection of the two combined regions.
|
||||
wxRGN_COPY, // Creates a copy of the region identified by hrgnSrc1.
|
||||
wxRGN_DIFF, // Combines the parts of hrgnSrc1 that are not part of hrgnSrc2.
|
||||
wxRGN_OR, // Creates the union of two combined regions.
|
||||
wxRGN_XOR // Creates the union of two combined regions except for any overlapping areas.
|
||||
};
|
||||
|
||||
class WXDLLEXPORT wxRegion : public wxGDIObject {
|
||||
DECLARE_DYNAMIC_CLASS(wxRegion);
|
||||
friend class WXDLLEXPORT wxRegionIterator;
|
||||
class WXDLLEXPORT wxRegion : public wxRegionGeneric
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxRegion);
|
||||
public:
|
||||
wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
|
||||
wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
|
||||
wxRegion(const wxRect& rect);
|
||||
wxRegion();
|
||||
wxRegion( const wxBitmap& bmp,
|
||||
const wxColour& transColour = wxNullColour,
|
||||
int tolerance = 0)
|
||||
wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
|
||||
: wxRegionGeneric(x,y,w,h)
|
||||
{}
|
||||
wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
|
||||
: wxRegionGeneric(topLeft, bottomRight)
|
||||
{}
|
||||
wxRegion(const wxRect& rect)
|
||||
: wxRegionGeneric(rect)
|
||||
{}
|
||||
wxRegion() {}
|
||||
wxRegion(const wxBitmap& bmp,
|
||||
const wxColour& transColour = wxNullColour,
|
||||
int tolerance = 0)
|
||||
: wxRegionGeneric()
|
||||
{
|
||||
Union(bmp, transColour, tolerance);
|
||||
}
|
||||
|
||||
~wxRegion();
|
||||
|
||||
//# Copying
|
||||
~wxRegion() {}
|
||||
wxRegion(const wxRegion& r)
|
||||
: wxGDIObject()
|
||||
{ Ref(r); }
|
||||
wxRegion& operator = (const wxRegion& r)
|
||||
{ Ref(r); return (*this); }
|
||||
|
||||
//# Modify region
|
||||
// Clear current region
|
||||
void Clear();
|
||||
|
||||
// Move the region
|
||||
bool Offset(wxCoord x, wxCoord y);
|
||||
|
||||
// Union rectangle or region with this.
|
||||
bool Union(long x, long y, long width, long height)
|
||||
{ return Combine(x, y, width, height, wxRGN_OR); }
|
||||
bool Union(const wxRect& rect)
|
||||
{ return Combine(rect, wxRGN_OR); }
|
||||
bool Union(const wxRegion& region)
|
||||
{ return Combine(region, wxRGN_OR); }
|
||||
|
||||
// Intersect rectangle or region with this.
|
||||
bool Intersect(long x, long y, long width, long height)
|
||||
{ return Combine(x, y, width, height, wxRGN_AND); }
|
||||
bool Intersect(const wxRect& rect)
|
||||
{ return Combine(rect, wxRGN_AND); }
|
||||
bool Intersect(const wxRegion& region)
|
||||
{ return Combine(region, wxRGN_AND); }
|
||||
|
||||
// Subtract rectangle or region from this:
|
||||
// Combines the parts of 'this' that are not part of the second region.
|
||||
bool Subtract(long x, long y, long width, long height)
|
||||
{ return Combine(x, y, width, height, wxRGN_DIFF); }
|
||||
bool Subtract(const wxRect& rect)
|
||||
{ return Combine(rect, wxRGN_DIFF); }
|
||||
bool Subtract(const wxRegion& region)
|
||||
{ return Combine(region, wxRGN_DIFF); }
|
||||
|
||||
// XOR: the union of two combined regions except for any overlapping areas.
|
||||
bool Xor(long x, long y, long width, long height)
|
||||
{ return Combine(x, y, width, height, wxRGN_XOR); }
|
||||
bool Xor(const wxRect& rect)
|
||||
{ return Combine(rect, wxRGN_XOR); }
|
||||
bool Xor(const wxRegion& region)
|
||||
{ return Combine(region, wxRGN_XOR); }
|
||||
|
||||
//# Information on region
|
||||
// Outer bounds of region
|
||||
void GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const;
|
||||
wxRect GetBox() const ;
|
||||
|
||||
// Is region empty?
|
||||
bool Empty() const;
|
||||
inline bool IsEmpty() const { return Empty(); }
|
||||
|
||||
//# Tests
|
||||
// Does the region contain the point (x,y)?
|
||||
wxRegionContain Contains(long x, long y) const;
|
||||
// Does the region contain the point pt?
|
||||
wxRegionContain Contains(const wxPoint& pt) const;
|
||||
// Does the region contain the rectangle (x, y, w, h)?
|
||||
wxRegionContain Contains(long x, long y, long w, long h) const;
|
||||
// Does the region contain the rectangle rect?
|
||||
wxRegionContain Contains(const wxRect& rect) const;
|
||||
|
||||
// Convert the region to a B&W bitmap with the black pixels being inside
|
||||
// the region.
|
||||
wxBitmap ConvertToBitmap() const;
|
||||
: wxRegionGeneric(r)
|
||||
{}
|
||||
wxRegion& operator= (const wxRegion& r)
|
||||
{ return *(wxRegion*)&(this->wxRegionGeneric::operator=(r)); }
|
||||
|
||||
// Use the non-transparent pixels of a wxBitmap for the region to combine
|
||||
// with this region. If the bitmap has a mask then it will be used,
|
||||
// otherwise the colour to be treated as transparent may be specified,
|
||||
// along with an optional tolerance value.
|
||||
// NOTE: implemented in common/rgncmn.cpp
|
||||
bool Union(const wxBitmap& bmp,
|
||||
const wxColour& transColour = wxNullColour,
|
||||
int tolerance = 0);
|
||||
/* And because of function hiding: */
|
||||
bool Union(long x, long y, long width, long height)
|
||||
{ return wxRegionGeneric::Union(x,y,width,height); }
|
||||
bool Union(const wxRect& rect)
|
||||
{ return wxRegionGeneric::Union(rect); }
|
||||
bool Union(const wxRegion& region)
|
||||
{ return wxRegionGeneric::Union(region); }
|
||||
|
||||
// Convert the region to a B&W bitmap with the black pixels being inside
|
||||
// the region.
|
||||
// NOTE: implemented in common/rgncmn.cpp
|
||||
wxBitmap ConvertToBitmap() const;
|
||||
|
||||
// Internal
|
||||
bool Combine(long x, long y, long width, long height, wxRegionOp op);
|
||||
bool Combine(const wxRegion& region, wxRegionOp op);
|
||||
bool Combine(const wxRect& rect, wxRegionOp op);
|
||||
};
|
||||
|
||||
class WXDLLEXPORT wxRegionIterator : public wxObject
|
||||
class WXDLLEXPORT wxRegionIterator : public wxRegionIteratorGeneric
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxRegionIterator)
|
||||
|
||||
// DECLARE_DYNAMIC_CLASS(wxRegionIteratorGeneric);
|
||||
public:
|
||||
wxRegionIterator();
|
||||
wxRegionIterator(const wxRegion& region);
|
||||
wxRegionIterator(const wxRegionIterator& iterator);
|
||||
~wxRegionIterator();
|
||||
wxRegionIterator() {}
|
||||
wxRegionIterator(const wxRegion& region)
|
||||
: wxRegionIteratorGeneric(region)
|
||||
{}
|
||||
wxRegionIterator(const wxRegionIterator& iterator)
|
||||
: wxRegionIteratorGeneric(iterator)
|
||||
{}
|
||||
~wxRegionIterator() {}
|
||||
|
||||
wxRegionIterator& operator=(const wxRegionIterator& iterator);
|
||||
|
||||
void Reset() { m_current = 0; }
|
||||
void Reset(const wxRegion& region);
|
||||
|
||||
operator bool () const { return m_current < m_numRects; }
|
||||
bool HaveRects() const { return m_current < m_numRects; }
|
||||
|
||||
wxRegionIterator& operator++();
|
||||
wxRegionIterator operator++(int);
|
||||
|
||||
long GetX() const;
|
||||
long GetY() const;
|
||||
long GetW() const;
|
||||
long GetWidth() const { return GetW(); }
|
||||
long GetH() const;
|
||||
long GetHeight() const { return GetH(); }
|
||||
wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
|
||||
private:
|
||||
void SetRects(long numRects, wxRect *rects);
|
||||
|
||||
long m_current;
|
||||
long m_numRects;
|
||||
wxRegion m_region;
|
||||
wxRect* m_rects;
|
||||
wxRegionIterator& operator=(const wxRegionIterator& iter)
|
||||
{ return *(wxRegionIterator*)&(this->wxRegionIteratorGeneric::operator=(iter)); }
|
||||
};
|
||||
|
||||
#endif
|
||||
// _WX_REGION_H_
|
||||
#endif //ndef _WX_COCOA_REGION_H__
|
||||
|
||||
@ -1,173 +0,0 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// File: region.cpp
|
||||
// Purpose: Region class
|
||||
// Author: Markus Holzem, Julian Smart, Robert Roebling
|
||||
// Created: Fri Oct 24 10:46:34 MET 1997
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) 1997 Markus Holzem, Julian Smart, Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "region.h"
|
||||
#endif
|
||||
|
||||
#include "wx/region.h"
|
||||
#include "wx/gdicmn.h"
|
||||
#include "wx/log.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// macros
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxRegion construction
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
wxRegion::~wxRegion()
|
||||
{
|
||||
// m_refData unrefed in ~wxObject
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxRegion comparison
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxRegion operations
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
void wxRegion::Clear()
|
||||
{
|
||||
UnRef();
|
||||
}
|
||||
|
||||
bool wxRegion::Offset(wxCoord x, wxCoord y)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
bool wxRegion::Combine(const wxRegion& region, wxRegionOp op)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// Does the region contain the point (x,y)?
|
||||
wxRegionContain wxRegion::Contains(long x, long y) const
|
||||
{
|
||||
return wxOutRegion;
|
||||
}
|
||||
|
||||
// Does the region contain the point pt?
|
||||
wxRegionContain wxRegion::Contains(const wxPoint& pt) const
|
||||
{
|
||||
return wxOutRegion;
|
||||
}
|
||||
|
||||
// Does the region contain the rectangle (x, y, w, h)?
|
||||
wxRegionContain wxRegion::Contains(long x, long y, long w, long h) const
|
||||
{
|
||||
return wxOutRegion;
|
||||
}
|
||||
|
||||
// Does the region contain the rectangle rect?
|
||||
wxRegionContain wxRegion::Contains(const wxRect& rect) const
|
||||
{
|
||||
return wxOutRegion;
|
||||
}
|
||||
|
||||
void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const
|
||||
{
|
||||
}
|
||||
|
||||
wxRect wxRegion::GetBox() const
|
||||
{
|
||||
return wxRect();
|
||||
}
|
||||
|
||||
wxRegion::wxRegion()
|
||||
{
|
||||
}
|
||||
|
||||
wxRegion::wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
|
||||
{
|
||||
}
|
||||
|
||||
wxRegion::wxRegion(const wxRect& rect)
|
||||
{
|
||||
}
|
||||
|
||||
wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
|
||||
{
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxRegionIterator
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
wxRegionIterator::wxRegionIterator()
|
||||
{
|
||||
m_current =
|
||||
m_numRects = 0;
|
||||
m_rects = NULL;
|
||||
}
|
||||
|
||||
wxRegionIterator::wxRegionIterator(const wxRegion& region)
|
||||
{
|
||||
m_current =
|
||||
m_numRects = 0;
|
||||
|
||||
m_rects = NULL;
|
||||
}
|
||||
|
||||
wxRegionIterator::wxRegionIterator(const wxRegionIterator& iterator)
|
||||
{
|
||||
m_current = iterator.m_current;
|
||||
m_numRects = iterator.m_numRects;
|
||||
|
||||
// TODO: copy m_rects
|
||||
m_rects = NULL;
|
||||
}
|
||||
|
||||
wxRegionIterator wxRegionIterator::operator++(int)
|
||||
{
|
||||
return wxRegionIterator(*this);
|
||||
}
|
||||
|
||||
long wxRegionIterator::GetX() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
long wxRegionIterator::GetY() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
long wxRegionIterator::GetW() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
long wxRegionIterator::GetH() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
wxRegionIterator::~wxRegionIterator()
|
||||
{
|
||||
// delete [] m_rects;
|
||||
}
|
||||
|
||||
15
src/cocoa/region.mm
Normal file
15
src/cocoa/region.mm
Normal file
@ -0,0 +1,15 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: cocoa/region.mm
|
||||
// Purpose: wxRegion class
|
||||
// Author: David Elliott
|
||||
// Modified by:
|
||||
// Created: 2004/04/12
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) 2004 David Elliott
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "wx/region.h"
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user