(blind) compilation fixes after latest changes

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

diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h
index 4a60ed3fa02e8328cc5c654430cd7fbfcab23daf..f4e2235cc08a41c459b3dceb3e8d2e4fb926f859 100644 (file)
--- a/include/wx/os2/region.h
+++ b/include/wx/os2/region.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxRegion class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxRegion class
 // Author:      David Webster
 // Modified by:


@@ -9,30 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_REGION_H_
-#define _WX_REGION_H_
+#ifndef _WX_OS2_REGION_H_
+#define _WX_OS2_REGION_H_

 
 #include "wx/list.h"
 
 #include "wx/list.h"

-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"

 #include "wx/os2/private.h"
 
 #include "wx/os2/private.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
+class WXDLLEXPORT wxRegion : public wxRegionWithCombine

 {
 public:
     wxRegion( wxCoord x
 {
 public:
     wxRegion( wxCoord x


@@ -45,193 +28,53 @@ public:
             );
     wxRegion(const wxRect& rRect);
     wxRegion(WXHRGN hRegion, WXHDC hPS); // Hangs on to this region
             );
     wxRegion(const wxRect& rRect);
     wxRegion(WXHRGN hRegion, WXHDC hPS); // Hangs on to this region

-
-    wxRegion();
-    ~wxRegion();
-
-    //
-    // Copying
-    //
-    inline wxRegion(const wxRegion& rSrc)
-        { Ref(rSrc); }
-    inline wxRegion& operator = (const wxRegion& rSrc)
-        { Ref(rSrc); return (*this); }
-
-    //
-    // Modify region
-    //
-
-    //
-    // Clear current region
-    //
-    void Clear(void);
-
-    bool Offset( wxCoord x
-                ,wxCoord y
-               );
-
-    //
-    // Union rectangle or region with this.
-    //
-    inline bool Union( wxCoord x
-                      ,wxCoord y
-                      ,wxCoord vWidth
-                      ,wxCoord vHeight
-                     )
+    wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
+    wxRegion( const wxBitmap& bmp)

     {
     {

-        return Combine( x
-                       ,y
-                       ,vWidth
-                       ,vHeight
-                       ,wxRGN_OR
-                      );
+        Union(bmp);

     }
     }

-    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 vWidth
-                          ,wxCoord vHeight
-                         )
+    wxRegion( const wxBitmap& bmp,
+              const wxColour& transColour, int tolerance = 0)

     {
     {

-        return Combine( x
-                       ,y
-                       ,vWidth
-                       ,vHeight
-                       ,wxRGN_AND
-                      );
+        Union(bmp, transColour, tolerance);

     }
     }

-    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 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); }
+    wxRegion();
+    virtual ~wxRegion();

 
     //
 
     //

-    // XOR: the union of two combined regions except for any overlapping areas.
+    // Modify region

     //
     //

-    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
-    // Outer bounds of region
+    // Clear current region

     //
     //

-    void   GetBox( wxCoord& rX
-                  ,wxCoord& rY
-                  ,wxCoord& rWidth
-                  ,wxCoord& rHeight
-                 ) const;
-    wxRect GetBox(void) const;
+    virtual void Clear();

 
     //
     // Is region empty?
     //
 
     //
     // Is region empty?
     //

-    bool        Empty(void) const;
-    inline bool IsEmpty() const { return Empty(); }
-
-    //
-    // Tests
-    // Does the region contain the point (x,y)?
-    //
-    wxRegionContain Contains( wxCoord lX
-                             ,wxCoord lY
-                            ) const;
-
-    //
-    // Convert the region to a B&W bitmap with the black pixels being inside
-    // the region.
-    //
-    wxBitmap        ConvertToBitmap(void) const;
-
-    // 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.
-    bool            Union( const wxBitmap& rBmp
-                          ,const wxColour& rTransColour = wxNullColour
-                          ,int   nTolerance = 0
-                         );
-
-    //
-    // Does the region contain the point pt?
-    //
-    wxRegionContain Contains(const wxPoint& rPoint) const;
-
-    //
-    // Does the region contain the rectangle (x, y, w, h)?
-    //
-    wxRegionContain Contains( wxCoord x
-                             ,wxCoord y
-                             ,wxCoord lWidth
-                             ,wxCoord lHeight
-                            ) const;
-
-    //
-    // Does the region contain the rectangle rect?
-    //
-    wxRegionContain Contains(const wxRect& rRect) const;
-
-    //
-    // 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
-                );
+    virtual bool IsEmpty() const;

 
     //
     // Get internal region handle
     //
 
     //
     // Get internal region handle
     //

-    WXHRGN GetHRGN(void) const;
+    WXHRGN GetHRGN() const;
+

     void   SetPS(HPS hPS);
 
 protected:
     virtual wxObjectRefData* CreateData(void) const;
     virtual wxObjectRefData* CloneData(const wxObjectRefData* pData) const;
 
     void   SetPS(HPS hPS);
 
 protected:
     virtual wxObjectRefData* CreateData(void) const;
     virtual wxObjectRefData* CloneData(const wxObjectRefData* pData) 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 WXDLLEXPORT wxRegionIterator;
     DECLARE_DYNAMIC_CLASS(wxRegion);
 
     friend class WXDLLEXPORT wxRegionIterator;
     DECLARE_DYNAMIC_CLASS(wxRegion);
 


@@ -243,7 +86,7 @@ DECLARE_DYNAMIC_CLASS(wxRegionIterator);
 public:
     wxRegionIterator();
     wxRegionIterator(const wxRegion& rRegion);
 public:
     wxRegionIterator();
     wxRegionIterator(const wxRegion& rRegion);

-    ~wxRegionIterator();
+    virtual ~wxRegionIterator();

 
     void Reset(void) { m_lCurrent = 0; }
     void Reset(const wxRegion& rRegion);
 
     void Reset(void) { m_lCurrent = 0; }
     void Reset(const wxRegion& rRegion);


@@ -269,5 +112,4 @@ private:
     wxRect*                         m_pRects;
 }; // end of wxRegionIterator
 
     wxRect*                         m_pRects;
 }; // end of wxRegionIterator
 

-#endif
-    // _WX_REGION_H_
+#endif // _WX_OS2_REGION_H_