Updated event type declarations to follow what other sub-libraries do these days...

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

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 457ecbd4ddb445fe7831bc84c866a9207f2cb398..846f1946cff755585b9f92c84977ce613f161a8c 100644 (file)
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -10,111 +10,104 @@
 #ifndef _WX_GTK_REGION_H_
 #define _WX_GTK_REGION_H_
 
 #ifndef _WX_GTK_REGION_H_
 #define _WX_GTK_REGION_H_
 

-#ifdef __GNUG__
-#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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxRegion);
-
-  public:
-
-    wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h );
-    wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight );
-    wxRegion( const wxRect& rect );
-    wxRegion();
-    ~wxRegion();
-
-    inline wxRegion( const wxRegion& r ): wxGDIObject()
-      { Ref(r); }
-    inline wxRegion& operator = ( const wxRegion& r )
-      { Ref(r); return (*this); }
-
-    bool operator == ( const wxRegion& region );
-    bool operator != ( const wxRegion& region );
-
-    void Clear();
-
-    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 );
+public:
+    wxRegion() { }
+
+    wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
+    {
+        InitRect(x, y, w, h);
+    }
+
+    wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight )
+    {
+        InitRect(topLeft.x, topLeft.y,
+                 bottomRight.x - topLeft.x, bottomRight.y - topLeft.y);
+    }
+
+    wxRegion( const wxRect& rect )
+    {
+        InitRect(rect.x, rect.y, rect.width, rect.height);
+    }
+
+    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;

 
 

-    bool Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
-    bool Subtract( const wxRect& rect );
-    bool Subtract( const wxRegion& region );
+public:
+    // Init with GdkRegion, set ref count to 2 so that
+    // the C++ class will not destroy the region!
+    wxRegion( GdkRegion *region );

 
 

-    bool Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
-    bool Xor( const wxRect& rect );
-    bool Xor( const wxRegion& region );
+    GdkRegion *GetRegion() const;

 
 

-    void GetBox( wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h ) const;
-    wxRect GetBox() const ;
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

 
 

-    bool Empty() const;
-    bool IsEmpty() const { return Empty(); }
+    // 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;

 
 

-    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;
+    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);

 
 

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

 
 

-    wxList    *GetRectList() const;
-    GdkRegion *GetRegion() const;
+private:
+    DECLARE_DYNAMIC_CLASS(wxRegion)

 };
 
 };
 

-class wxRegionIterator: public wxObject
+// ----------------------------------------------------------------------------
+// wxRegionIterator: decomposes a region into rectangles
+// ----------------------------------------------------------------------------
+
+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();

 
 

-    void Reset() { m_current = 0; }
+    wxRegionIterator& operator=(const wxRegionIterator& ri);
+
+    void Reset() { m_current = 0u; }

     void Reset(const wxRegion& region);
 
     void Reset(const wxRegion& region);
 

-    operator bool () const;

     bool HaveRects() const;
     bool HaveRects() const;

+    operator bool () const { return HaveRects(); }

 
 

-    void operator ++ ();
-    void operator ++ (int);
+    wxRegionIterator& operator ++ ();
+    wxRegionIterator operator ++ (int);

 
     wxCoord GetX() const;
     wxCoord GetY() const;
 
     wxCoord GetX() const;
     wxCoord GetY() const;


@@ -122,14 +115,20 @@ public:
     wxCoord GetWidth() const { return GetW(); }
     wxCoord GetH() const;
     wxCoord GetHeight() const { return GetH(); }
     wxCoord GetWidth() const { return GetW(); }
     wxCoord GetH() const;
     wxCoord GetHeight() const { return GetH(); }

-    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
+    wxRect GetRect() const;

 
 private:
 
 private:

-    long       m_current;
-    wxRegion   m_region;
+    void Init();
+    void CreateRects( const wxRegion& r );
+
+    size_t   m_current;
+    wxRegion m_region;
+
+    wxRect *m_rects;
+    size_t  m_numRects;

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+    DECLARE_DYNAMIC_CLASS(wxRegionIterator)

 };
 
 
 };