Applied patch [ 1845819 ] wxMSW Top level window freeze fix for trunk

[wxWidgets.git] / include / wx / msw / region.h

diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h
index 4349debda6ec2468dffdbf23d4704ff4f4b80a38..97203acb3f772625c8c7169533e1e98c723fb0ae 100644 (file)
--- a/include/wx/msw/region.h
+++ b/include/wx/msw/region.h
@@ -1,145 +1,104 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        region.h
+// Name:        wx/msw/region.h

 // Purpose:     wxRegion class
 // Purpose:     wxRegion class

-// Author:      Markus Holzem, Julian Smart
+// Author:      Julian Smart

 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Copyright:   (c) 1997-2002 wxWidgets team
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_REGION_H_
-#define _WX_REGION_H_
+#ifndef _WX_MSW_REGION_H_
+#define _WX_MSW_REGION_H_

 
 

-#ifdef __GNUG__
-#pragma interface "region.h"
-#endif
-
-#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 wxRegionWithCombine
+{

 public:
 public:

-    wxRegion(long x, long y, long w, long h);
+    wxRegion();
+    wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h);

     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
     wxRegion(WXHRGN hRegion); // Hangs on to this region
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
     wxRegion(WXHRGN hRegion); // Hangs on to this region

-
-       wxRegion(void);
-       ~wxRegion(void);
-
-       //# Copying
-       inline wxRegion(const wxRegion& r)
-               { Ref(r); }
-       inline wxRegion& operator = (const wxRegion& r)
-               { Ref(r); return (*this); }
-
-       //# Modify region
-       // Clear current region
-       void Clear(void);
-
-       // Union rectangle or region with this.
-       inline bool Union(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_OR); }
-       inline bool Union(const wxRect& rect) { return Combine(rect, wxRGN_OR); }
-       inline bool Union(const wxRegion& region) { return Combine(region, wxRGN_OR); }
-
-       // Intersect rectangle or region with this.
-       inline bool Intersect(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_AND); }
-       inline bool Intersect(const wxRect& rect)  { return Combine(rect, wxRGN_AND); }
-       inline 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.
-       inline bool Subtract(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_DIFF); }
-       inline bool Subtract(const wxRect& rect)  { return Combine(rect, wxRGN_DIFF); }
-       inline bool Subtract(const wxRegion& region)  { return Combine(region, wxRGN_DIFF); }
-
-       // XOR: the union of two combined regions except for any overlapping areas.
-       inline bool Xor(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_XOR); }
-       inline bool Xor(const wxRect& rect)  { return Combine(rect, wxRGN_XOR); }
-       inline bool Xor(const wxRegion& region)  { return Combine(region, wxRGN_XOR); }
-
-       //# Information on region
-       // Outer bounds of region
-       void GetBox(long& x, long& y, long&w, long &h) const;
-       wxRect GetBox(void) const ;
-
-       // Is region empty?
-       bool Empty(void) const;
-    inline bool IsEmpty(void) 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;
-
-// 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);
+    wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
+#if wxUSE_IMAGE
+    wxRegion( const wxBitmap& bmp)
+    {
+        Union(bmp);
+    }
+    wxRegion( const wxBitmap& bmp,
+              const wxColour& transColour, int tolerance = 0)
+    {
+        Union(bmp, transColour, tolerance);
+    }
+#endif // wxUSE_IMAGE
+
+    virtual ~wxRegion();
+
+    // wxRegionBase methods
+    virtual void Clear();
+    virtual bool IsEmpty() const;

 
     // Get internal region handle
     WXHRGN GetHRGN() const;
 
     // Get internal region handle
     WXHRGN GetHRGN() const;

+
+protected:
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+
+    virtual bool DoIsEqual(const wxRegion& region) const;
+    virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
+    virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const;
+    virtual wxRegionContain DoContainsRect(const wxRect& rect) const;
+
+    virtual bool DoOffset(wxCoord x, wxCoord y);
+    virtual bool DoCombine(const wxRegion& region, wxRegionOp op);
+
+    friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;
+
+    DECLARE_DYNAMIC_CLASS(wxRegion)

 };
 
 };
 

-class WXDLLEXPORT wxRegionIterator : public wxObject {
-DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+class WXDLLEXPORT wxRegionIterator : public wxObject
+{

 public:
 public:

-       wxRegionIterator(void);
-       wxRegionIterator(const wxRegion& region);
-       ~wxRegionIterator(void);
+    wxRegionIterator() { Init(); }
+    wxRegionIterator(const wxRegion& region);
+    wxRegionIterator(const wxRegionIterator& ri) : wxObject(ri) { Init(); *this = ri; }
+
+    wxRegionIterator& operator=(const wxRegionIterator& ri);

 
 

-       void Reset(void) { m_current = 0; }
-       void Reset(const wxRegion& region);
+    virtual ~wxRegionIterator();

 
 

-#ifndef __SALFORDC__
-       operator bool (void) const { return (m_current < m_numRects); }
-#endif
+    void Reset() { m_current = 0; }
+    void Reset(const wxRegion& region);

 
 

-       bool HaveRects(void) const { return (m_current < m_numRects); }
+    bool HaveRects() const { return (m_current < m_numRects); }

 
 

-       void operator ++ (void);
-       void operator ++ (int);
+    operator bool () const { return HaveRects(); }

 
 

-       long GetX(void) const;
-       long GetY(void) const;
-       long GetW(void) const;
-       long GetWidth(void) const { return GetW(); }
-       long GetH(void) const;
-       long GetHeight(void) const { return GetH(); }
-    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
+    wxRegionIterator& operator++();
+    wxRegionIterator operator++(int);
+
+    wxCoord GetX() const;
+    wxCoord GetY() const;
+    wxCoord GetW() const;
+    wxCoord GetWidth() const { return GetW(); }
+    wxCoord GetH() const;
+    wxCoord GetHeight() const { return GetH(); }
+
+    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetW(), GetH()); }

 
 private:
 
 private:

-       long     m_current;
-       long     m_numRects;
-       wxRegion m_region;
+    // common part of all ctors
+    void Init();
+
+    long     m_current;
+    long     m_numRects;
+    wxRegion m_region;

     wxRect*  m_rects;
     wxRect*  m_rects;

+
+    DECLARE_DYNAMIC_CLASS(wxRegionIterator)

 };
 
 };
 

-#endif
-       // _WX_REGION_H_
+#endif // _WX_MSW_REGION_H_