From 5a56a532f29c35adfe6eb2c1c81315fa1e7ba921 Mon Sep 17 00:00:00 2001 From: David Webster Date: Mon, 18 Dec 2000 05:32:32 +0000 Subject: [PATCH] Fixes mostly to do with painting git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/os2/colour.h | 4 + include/wx/os2/region.h | 236 +++++++++++++++++++++++++++++----------- 2 files changed, 176 insertions(+), 64 deletions(-) diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h index b49aa6a2c2..b82c55433e 100644 --- a/include/wx/os2/colour.h +++ b/include/wx/os2/colour.h @@ -71,6 +71,10 @@ public: ,(unsigned char)(lColRGB >> 16) ); } + void Set(const wxString& rsColour) + { + InitFromName(rsColour); + } // // Accessors diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h index e524cc157e..0fca2f9090 100644 --- a/include/wx/os2/region.h +++ b/include/wx/os2/region.h @@ -24,115 +24,223 @@ enum wxRegionContain { }; // 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 { +class WXDLLEXPORT wxRegion : public wxGDIObject +{ DECLARE_DYNAMIC_CLASS(wxRegion); friend class WXDLLEXPORT wxRegionIterator; public: - wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h); - wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); - wxRegion(const wxRect& rect); + wxRegion( wxCoord x + ,wxCoord y + ,wxCoord vWidth + ,wxCoord vHeight + ); + wxRegion( const wxPoint& rTopLeft + ,const wxPoint& rBottomRight + ); + wxRegion(const wxRect& rRect); wxRegion(WXHRGN hRegion); // Hangs on to this region wxRegion(); ~wxRegion(); - //# Copying - inline wxRegion(const wxRegion& r) - { Ref(r); } - inline wxRegion& operator = (const wxRegion& r) - { Ref(r); return (*this); } + // + // Copying + // + inline wxRegion(const wxRegion& rSrc) + { Ref(rSrc); } + inline wxRegion& operator = (const wxRegion& rSrc) + { Ref(rSrc); return (*this); } - //# Modify region + // + // Modify region + // + + // // Clear current region - void Clear(); + // + void Clear(void); + // // 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); } + // + inline bool Union( wxCoord x + ,wxCoord y + ,wxCoord vWidth + ,wxCoord vHeight + ) + { + return Combine( x + ,y + ,vWidth + ,vHeight + ,wxRGN_OR + ); + } + inline bool Union( const wxRect& rRect) { return Combine(rRect, wxRGN_OR); } + inline bool Union(const wxRegion& rRegion) { return Combine(rRegion, wxRGN_OR); } + // // 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); } + // + inline bool Intersect( wxCoord x + ,wxCoord y + ,wxCoord vWidth + ,wxCoord vHeight + ) + { + return Combine( x + ,y + ,vWidth + ,vHeight + ,wxRGN_AND + ); + } + inline bool Intersect(const wxRect& rRect) { return Combine(rRect, wxRGN_AND); } + inline bool Intersect(const wxRegion& rRegion) { return Combine(rRegion, wxRGN_AND); } + // // Subtract rectangle or region from this: // Combines the parts of 'this' that are not part of the second region. - 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); } + // + inline bool Subtract( wxCoord x + ,wxCoord y + ,wxCoord vWidth + ,wxCoord vHeight + ) + { + return Combine( x + ,y + ,vWidth + ,vHeight + ,wxRGN_DIFF + ); + } + inline bool Subtract(const wxRect& rRect) { return Combine(rRect, wxRGN_DIFF); } + inline bool Subtract(const wxRegion& rRegion) { return Combine(rRegion, 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); } + // + inline bool Xor( wxCoord x + ,wxCoord y + ,wxCoord vWidth + ,wxCoord vHeight + ) + { + return Combine( x + ,y + ,vWidth + ,vHeight + ,wxRGN_XOR + ); + } + inline bool Xor(const wxRect& rRect) { return Combine(rRect, wxRGN_XOR); } + inline bool Xor(const wxRegion& rRegion) { return Combine(rRegion, wxRGN_XOR); } - //# Information on region + // + // Information on region // Outer bounds of region - void GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const; - wxRect GetBox() const ; + // + void GetBox( wxCoord& rX + ,wxCoord& rY + ,wxCoord& rWidth + ,wxCoord& rHeight + ) const; + wxRect GetBox(void) const; + // // Is region empty? - bool Empty() const; + // + bool Empty(void) const; inline bool IsEmpty() const { return Empty(); } - //# Tests + // + // Tests // Does the region contain the point (x,y)? - wxRegionContain Contains(wxCoord x, wxCoord y) const; + // + wxRegionContain Contains( wxCoord lX + ,wxCoord lY + ) const; + // // Does the region contain the point pt? - wxRegionContain Contains(const wxPoint& pt) const; + // + wxRegionContain Contains(const wxPoint& rPoint) const; + + // // Does the region contain the rectangle (x, y, w, h)? - wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const; + // + wxRegionContain Contains( wxCoord x + ,wxCoord y + ,wxCoord lWidth + ,wxCoord lHeight + ) const; + + // // Does the region contain the rectangle rect? - wxRegionContain Contains(const wxRect& rect) const; + // + wxRegionContain Contains(const wxRect& rRect) const; -// Internal - 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); + // + // Internal + // + bool Combine( wxCoord x + ,wxCoord y + ,wxCoord vWidth + ,wxCoord vHeight + ,wxRegionOp eOp + ); + bool Combine( const wxRegion& rRegion + ,wxRegionOp eOp + ); + bool Combine( const wxRect& rRect + ,wxRegionOp eOp + ); + // // Get internal region handle - WXHRGN GetHRGN() const; -}; + // + WXHRGN GetHRGN(void) const; + void SetPS(HPS hPS); +}; // end of CLASS wxRegion -class WXDLLEXPORT wxRegionIterator : public wxObject { +class WXDLLEXPORT wxRegionIterator : public wxObject +{ DECLARE_DYNAMIC_CLASS(wxRegionIterator); public: wxRegionIterator(); - wxRegionIterator(const wxRegion& region); + wxRegionIterator(const wxRegion& rRegion); ~wxRegionIterator(); - void Reset() { m_current = 0; } - void Reset(const wxRegion& region); + void Reset(void) { m_lCurrent = 0; } + void Reset(const wxRegion& rRegion); - operator bool () const { return m_current < m_numRects; } - bool HaveRects() const { return m_current < m_numRects; } + operator bool (void) const { return m_lCurrent < m_lNumRects; } + bool HaveRects(void) const { return m_lCurrent < m_lNumRects; } - void operator ++ (); + void operator ++ (void); void 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(), GetWidth(), GetHeight()); } + 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(void) const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); } private: - long m_current; - long m_numRects; - wxRegion m_region; - wxRect* m_rects; -}; + long m_lCurrent; + long m_lNumRects; + wxRegion m_vRegion; + wxRect* m_pRects; +}; // end of wxRegionIterator #endif // _WX_REGION_H_