Some OS/2 updates

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

diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h
index f0c9cfbcb2d3c2a5410d8194d3e24f0fab7ec5a9..58c4d94baa1054b58e745faf5047962155cb7d11 100644 (file)
--- a/include/wx/msw/region.h
+++ b/include/wx/msw/region.h
@@ -1,16 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxRegion class
 // Author:      Markus Holzem, Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     wxRegion class
 // Author:      Markus Holzem, Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

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

-#ifndef __REGIONH__
-#define __REGIONH__
+#ifndef _WX_REGION_H_
+#define _WX_REGION_H_

 
 #ifdef __GNUG__
 #pragma interface "region.h"
 
 #ifdef __GNUG__
 #pragma interface "region.h"


@@ -18,120 +18,137 @@
 
 #include "wx/list.h"
 #include "wx/gdiobj.h"
 
 #include "wx/list.h"
 #include "wx/gdiobj.h"

+#include "wx/gdicmn.h"

 
 class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxPoint;
 
 
 class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxPoint;
 

-enum wxRegionContain {
-       wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
+enum wxRegionContain
+{
+    wxOutRegion = 0,
+    wxPartRegion = 1,
+    wxInRegion = 2

 };
 
 // So far, for internal use only
 };
 
 // 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.
+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 wxGDIObject
+{

 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(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );

 
 

-       wxRegion(void);
-       ~wxRegion(void);
+    virtual ~wxRegion();

 
 

-       //# Copying
-       inline wxRegion(const wxRegion& r)
-               { Ref(r); }
-       inline wxRegion& operator = (const wxRegion& r)
-               { Ref(r); return (*this); }
+    // Copying
+    wxRegion(const wxRegion& r)
+        { Ref(r); }
+    wxRegion& operator = (const wxRegion& r)
+        { Ref(r); return (*this); }

 
 

-       //# Modify region
-       // Clear current region
-       void Clear(void);
+    // 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); }
+    // Union rectangle or region with this.
+    inline bool Union(wxCoord x, wxCoord y, wxCoord width, wxCoord 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); }
+    // Intersect rectangle or region with this.
+    inline bool Intersect(wxCoord x, wxCoord y, wxCoord width, wxCoord 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:
+    // Subtract rectangle or region from this:

     // Combines the parts of 'this' that are not part of the second region.
     // 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 Subtract(wxCoord x, wxCoord y, wxCoord width, wxCoord 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(wxCoord x, wxCoord y, wxCoord width, wxCoord 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(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const;
+    wxRect GetBox(void) const ;
+
+    // Is region empty?
+    bool Empty(void) const;

     inline bool IsEmpty(void) const { return Empty(); }
 
     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;
+    // Tests
+    // Does the region contain the point (x,y)?
+    wxRegionContain Contains(wxCoord x, wxCoord 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(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const;
+    // Does the region contain the rectangle rect?
+    wxRegionContain Contains(const wxRect& rect) const;

 
 // Internal
 
 // 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);
+    bool Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op);
+    bool Combine(const wxRegion& region, wxRegionOp op);
+    bool Combine(const wxRect& rect, wxRegionOp op);
+
+    // Get internal region handle
+    WXHRGN GetHRGN() const;
+
+    DECLARE_DYNAMIC_CLASS(wxRegion);
+    friend class WXDLLEXPORT wxRegionIterator;

 };
 
 };
 

-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(void);
+    wxRegionIterator(const wxRegion& region);
+    ~wxRegionIterator(void);

 
 

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

 
 

-       operator bool (void) const { return m_current < m_numRects; }
-       bool HaveRects(void) const { return m_current < m_numRects; }
+#ifndef __SALFORDC__
+    operator bool (void) const { return (m_current < m_numRects); }
+#endif

 
 

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

 
 

-       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(); }
+    void operator ++ (void);
+    void operator ++ (int);
+
+    wxCoord GetX(void) const;
+    wxCoord GetY(void) const;
+    wxCoord GetW(void) const;
+    wxCoord GetWidth(void) const { return GetW(); }
+    wxCoord GetH(void) const;
+    wxCoord GetHeight(void) const { return GetH(); }
+    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }

 
 private:
 
 private:

-       long     m_current;
-       long     m_numRects;
-       wxRegion m_region;
+    long     m_current;
+    long     m_numRects;
+    wxRegion m_region;

     wxRect*  m_rects;
     wxRect*  m_rects;

+
+    DECLARE_DYNAMIC_CLASS(wxRegionIterator);

 };
 
 #endif
 };
 
 #endif

-       // __REGIONH__
+    // _WX_REGION_H_