From 75c0a76a53bc31b162590fc767f5b2fe73ad07df Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 21 Apr 2002 18:52:28 +0000 Subject: changed external window interface to only have an area(), no size() and origin(), since all of their values are also in area() changed toolbar external inteface to have an area, no more getX/Y/Width/Height --- src/Toolbar.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/Toolbar.h') diff --git a/src/Toolbar.h b/src/Toolbar.h index bf67b506..a4326c12 100644 --- a/src/Toolbar.h +++ b/src/Toolbar.h @@ -29,6 +29,7 @@ #include "Timer.h" #include "Resource.h" #include "Screen.h" +#include "Geometry.h" // forward declaration class Toolbar; @@ -114,12 +115,16 @@ public: inline const Window &getWindowID() const { return frame.window; } - inline unsigned int getWidth() const { return frame.width; } - inline unsigned int getHeight() const { return frame.height; } + //inline unsigned int getWidth() const { return frame.width; } + //inline unsigned int getHeight() const { return frame.height; } unsigned int getExposedHeight() const; - int getX() const; - int getY() const; + //int getX() const; + //int getY() const; + + Rect area() const; + //Size size() const { return area().size(); } + //Point origin() const { return area().origin(); } void buttonPressEvent(XButtonEvent *); void buttonReleaseEvent(XButtonEvent *); -- cgit v1.2.3