Merge branch 'master' of git://github.com/thepowersgang/acess2

[tpg/acess2.git] / Usermode / Applications / axwin4_src / Server / include / CRect.hpp

diff --git a/Usermode/Applications/axwin4_src/Server/include/CRect.hpp b/Usermode/Applications/axwin4_src/Server/include/CRect.hpp
index 69e7c19..3c344b2 100644 (file)
--- a/Usermode/Applications/axwin4_src/Server/include/CRect.hpp
+++ b/Usermode/Applications/axwin4_src/Server/include/CRect.hpp
@@ -8,9 +8,30 @@ namespace AxWin {
 class CRect
 {
 public:
-       CRect(int X, int Y, int W, int H);
+       CRect():
+               CRect(0,0,0,0)
+       {
+       };
+       CRect(int X, int Y, unsigned int W, unsigned int H);
        
-       bool Contains(const CRect& other) const;
+       void Translate(int DX, int DY) {
+               m_x += DX;      m_x2 += DX;
+               m_y += DY;      m_y2 += DY;
+       }
+       void Move(int NewX, int NewY);
+       void Resize(int NewW, int NewH);
+       
+       bool HasIntersection(const CRect& other) const;
+       CRect Intersection(const CRect& other) const;
+       
+       CRect RelativeIntersection(const CRect& area);
+       
+       int     m_x;
+       int     m_y;
+       int     m_w;
+       int     m_h;
+       int     m_x2;
+       int     m_y2;
 };
 
 };     // namespace AxWin