- disabled gui for a moment

[enigma2.git] / lib / gdi / region.h

diff --git a/lib/gdi/region.h b/lib/gdi/region.h
index a1dbe91660ca64694680970276ea17ccaaf70e30..7f73be753e71378d8f2ce55ea873d5001d3d3e27 100644 (file)
--- a/lib/gdi/region.h
+++ b/lib/gdi/region.h
@@ -4,9 +4,8 @@
 #include <lib/base/object.h>
 #include <vector>
 
 #include <lib/base/object.h>
 #include <vector>
 

-class gRegion: public virtual iObject
+class gRegion

 {
 {

-DECLARE_REF;

 private:
        inline void FindBand(
                        std::vector<eRect>::const_iterator r,
 private:
        inline void FindBand(
                        std::vector<eRect>::const_iterator r,


@@ -77,9 +76,18 @@ public:
        gRegion();
        virtual ~gRegion();
 
        gRegion();
        virtual ~gRegion();
 

+       gRegion operator&(const gRegion &r2) const;
+       gRegion operator-(const gRegion &r2) const;
+       gRegion operator|(const gRegion &r2) const;
+       gRegion &operator&=(const gRegion &r2);
+       gRegion &operator-=(const gRegion &r2);
+       gRegion &operator|=(const gRegion &r2);
+       

        void intersect(const gRegion &r1, const gRegion &r2);
        void subtract(const gRegion &r1, const gRegion &r2);
        void merge(const gRegion &r1, const gRegion &r2);
        void intersect(const gRegion &r1, const gRegion &r2);
        void subtract(const gRegion &r1, const gRegion &r2);
        void merge(const gRegion &r1, const gRegion &r2);

+       
+       void moveBy(ePoint offset);

 };
 
 #endif
 };
 
 #endif