Brand spankin new widgets for otk (Label and Button).

Add a new Size class.
Rect, Point, and Size are immutable classes.
Size uses *UNSIGNED* ints. This is causing me headaches * a bajillion right now, so we'll see about that.

1 files changed, 0 insertions, 151 deletions

diff --git a/otk/rect.cc b/otk/rect.cc
deleted file mode 100644
index 7ec5c2c4..00000000
--- a/otk/rect.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
-
-#include "rect.hh"
-
-namespace otk {
-
-void Rect::setX(int x)
-{
-  _x2 += x - _x1;
-  _x1 = x;
-}
-
-
-void Rect::setY(int y)
-{
-  _y2 += y - _y1;
-  _y1 = y;
-}
-
-
-void Rect::setPos(const Point &location)
-{
-  _x2 += location.x() - _x1;
-  _x1 = location.x();
-  _y2 += location.y() - _y1;
-  _y1 = location.y();
-}
-
-
-void Rect::setPos(int x, int y)
-{
-  _x2 += x - _x1;
-  _x1 = x;
-  _y2 += y - _y1;
-  _y1 = y;
-}
-
-
-void Rect::setWidth(int w)
-{
-  _x2 = w + _x1 - 1;
-}
-
-
-void Rect::setHeight(int h)
-{
-  _y2 = h + _y1 - 1;
-}
-
-
-void Rect::setSize(int w, int h)
-{
-  _x2 = w + _x1 - 1;
-  _y2 = h + _y1 - 1;
-}
-
-
-void Rect::setSize(const Point &size)
-{
-  _x2 = size.x() + _x1 - 1;
-  _y2 = size.y() + _y1 - 1;
-}
-
-
-void Rect::setRect(int x, int y, int w, int h)
-{
-  *this = Rect(x, y, w, h);
-}
-
-
-void Rect::setRect(const Point &location, const Point &size)
-{
-  *this = Rect(location, size);
-}
-
-
-void Rect::setCoords(int l, int t, int r, int b)
-{
-  _x1 = l;
-  _y1 = t;
-  _x2 = r;
-  _y2 = b;
-}
-
-
-void Rect::setCoords(const Point &tl, const Point &br)
-{
-  _x1 = tl.x();
-  _y1 = tl.y();
-  _x2 = br.x();
-  _y2 = br.y();
-}
-
-
-Rect Rect::operator|(const Rect &a) const
-{
-  Rect b;
-
-  b._x1 = std::min(_x1, a._x1);
-  b._y1 = std::min(_y1, a._y1);
-  b._x2 = std::max(_x2, a._x2);
-  b._y2 = std::max(_y2, a._y2);
-
-  return b;
-}
-
-
-Rect Rect::operator&(const Rect &a) const
-{
-  Rect b;
-
-  b._x1 = std::max(_x1, a._x1);
-  b._y1 = std::max(_y1, a._y1);
-  b._x2 = std::min(_x2, a._x2);
-  b._y2 = std::min(_y2, a._y2);
-
-  return b;
-}
-
-
-bool Rect::intersects(const Rect &a) const
-{
-  return std::max(_x1, a._x1) <= std::min(_x2, a._x2) &&
-         std::max(_y1, a._y1) <= std::min(_y2, a._y2);
-}
-
-
-bool Rect::contains(int x, int y) const
-{
-  return x >= _x1 && x <= _x2 &&
-         y >= _y1 && y <= _y2;
-}
-
-
-bool Rect::contains(const Point &p) const
-{
-  return contains(p.x(), p.y());
-}
-
-
-bool Rect::contains(const Rect& a) const
-{
-  return a._x1 >= _x1 && a._x2 <= _x2 &&
-         a._y1 >= _y1 && a._y2 <= _y2;
-}
-
-}