no changes, just remove #if'd out code

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

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 13ac5c70ff0b3679fc81827f2f1898fdf712bdd5..e465f0011f8abc0643c25643c4f51cd3eb986070 100644 (file)
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -4,52 +4,17 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_REGION_H_
 #define _WX_GTK_REGION_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_REGION_H_
 #define _WX_GTK_REGION_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
-#include "wx/list.h"
-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxRegion;
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-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.
-};
-

 // ----------------------------------------------------------------------------
 // wxRegion
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxRegion
 // ----------------------------------------------------------------------------
 

-class wxRegion : public wxGDIObject
+class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase

 {
 public:
     wxRegion() { }
 {
 public:
     wxRegion() { }


@@ -70,70 +35,26 @@ public:
         InitRect(rect.x, rect.y, rect.width, rect.height);
     }
 
         InitRect(rect.x, rect.y, rect.width, rect.height);
     }
 

-    wxRegion( size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
+    wxRegion( size_t n, const wxPoint *points, 
+              wxPolygonFillMode fillStyle = wxODDEVEN_RULE );

 
 

+#if wxUSE_IMAGE
+    wxRegion( const wxBitmap& bmp)
+    {
+        Union(bmp);
+    }

     wxRegion( const wxBitmap& bmp,
     wxRegion( const wxBitmap& bmp,

-              const wxColour& transColour = wxNullColour,
-              int   tolerance = 0)
+              const wxColour& transColour, int tolerance = 0)

     {
         Union(bmp, transColour, tolerance);
     }
     {
         Union(bmp, transColour, tolerance);
     }

+#endif // wxUSE_IMAGE

 
 

-    ~wxRegion();
-
-    wxRegion( const wxRegion& region )
-        : wxGDIObject()
-        { Ref(region); }
-    wxRegion& operator = ( const wxRegion& region ) { Ref(region); return *this; }
-
-    bool Ok() const { return m_refData != NULL; }
-
-    bool operator == ( const wxRegion& region );
-    bool operator != ( const wxRegion& region ) { return !(*this == region); }
-
-    void Clear();
-
-    bool Offset( wxCoord x, wxCoord y );
-
-    bool Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
-    bool Union( const wxRect& rect );
-    bool Union( const wxRegion& region );
-
-    bool Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
-    bool Intersect( const wxRect& rect );
-    bool Intersect( const wxRegion& region );
-
-    bool Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
-    bool Subtract( const wxRect& rect );
-    bool Subtract( const wxRegion& region );
-
-    bool Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
-    bool Xor( const wxRect& rect );
-    bool Xor( const wxRegion& region );
-
-    void GetBox( wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h ) const;
-    wxRect GetBox() const ;
-
-    bool Empty() const;
-    bool IsEmpty() const { return Empty(); }
-
-    wxRegionContain Contains( wxCoord x, wxCoord y ) const;
-    wxRegionContain Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) const;
-    wxRegionContain Contains(const wxPoint& pt) const;
-    wxRegionContain Contains(const wxRect& rect) const;
-
-    // Convert the region to a B&W bitmap with the white pixels being inside
-    // the region.
-    wxBitmap ConvertToBitmap() 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& bmp,
-               const wxColour& transColour = wxNullColour,
-               int   tolerance = 0);
+    virtual ~wxRegion();

 
 

+    // wxRegionBase methods
+    virtual void Clear();
+    virtual bool IsEmpty() const;

 
 public:
     // Init with GdkRegion, set ref count to 2 so that
 
 public:
     // Init with GdkRegion, set ref count to 2 so that


@@ -143,26 +64,42 @@ public:
     GdkRegion *GetRegion() const;
 
 protected:
     GdkRegion *GetRegion() const;
 
 protected:

-    // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+    // wxRegionBase pure virtuals
+    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 DoUnionWithRect(const wxRect& rect);
+    virtual bool DoUnionWithRegion(const wxRegion& region);
+    virtual bool DoIntersect(const wxRegion& region);
+    virtual bool DoSubtract(const wxRegion& region);
+    virtual bool DoXor(const wxRegion& region);

 
     // common part of ctors for a rectangle region
     void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
 
 private:
 
     // common part of ctors for a rectangle region
     void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxRegion);
+    DECLARE_DYNAMIC_CLASS(wxRegion)

 };
 
 // ----------------------------------------------------------------------------
 // wxRegionIterator: decomposes a region into rectangles
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // wxRegionIterator: decomposes a region into rectangles
 // ----------------------------------------------------------------------------
 

-class wxRegionIterator: public wxObject
+class WXDLLIMPEXP_CORE wxRegionIterator: public wxObject

 {
 public:
     wxRegionIterator();
     wxRegionIterator(const wxRegion& region);
 {
 public:
     wxRegionIterator();
     wxRegionIterator(const wxRegion& region);

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

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


@@ -182,11 +119,17 @@ public:
     wxRect GetRect() const;
 
 private:
     wxRect GetRect() const;
 
 private:

+    void Init();
+    void CreateRects( const wxRegion& r );
+

     size_t   m_current;
     wxRegion m_region;
 
     size_t   m_current;
     wxRegion m_region;
 

+    wxRect *m_rects;
+    size_t  m_numRects;
+

 private:
 private:

-    DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+    DECLARE_DYNAMIC_CLASS(wxRegionIterator)

 };
 
 
 };