aboutsummaryrefslogtreecommitdiff
path: root/gui/object.h
diff options
context:
space:
mode:
authorStrangerke2013-09-11 21:33:10 +0200
committerStrangerke2013-09-11 21:33:10 +0200
commitda1a427e794434a09cd39ab45e32ae7afca9a170 (patch)
tree85b4700515bc7853e4f90ddae22bc3b785c4ab3a /gui/object.h
parent49dbac6a2a5cde294a4c4c9a47467e7b5d95e08b (diff)
parent5c6ee7573c0cf05bbbb154d4734e94e478f453e5 (diff)
downloadscummvm-rg350-da1a427e794434a09cd39ab45e32ae7afca9a170.tar.gz
scummvm-rg350-da1a427e794434a09cd39ab45e32ae7afca9a170.tar.bz2
scummvm-rg350-da1a427e794434a09cd39ab45e32ae7afca9a170.zip
Merge branch 'master' of https://github.com/urukgit/scummvm into avalanche
Diffstat (limited to 'gui/object.h')
-rw-r--r--gui/object.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/gui/object.h b/gui/object.h
index bce3cd7846..dac3341b5a 100644
--- a/gui/object.h
+++ b/gui/object.h
@@ -24,6 +24,7 @@
#include "common/scummsys.h"
#include "common/str.h"
+#include "common/rect.h"
namespace GUI {
@@ -59,6 +60,8 @@ class Widget;
class GuiObject : public CommandReceiver {
friend class Widget;
protected:
+ Common::Rect _textDrawableArea;
+
int16 _x, _y;
uint16 _w, _h;
const Common::String _name;
@@ -66,10 +69,12 @@ protected:
Widget *_firstWidget;
public:
- GuiObject(int x, int y, int w, int h) : _x(x), _y(y), _w(w), _h(h), _firstWidget(0) { }
+ GuiObject(int x, int y, int w, int h) : _x(x), _y(y), _w(w), _h(h), _firstWidget(0), _textDrawableArea(Common::Rect(0, 0, 0, 0)) { }
GuiObject(const Common::String &name);
~GuiObject();
+ virtual void setTextDrawableArea(const Common::Rect &r) { _textDrawableArea = r; }
+
virtual int16 getAbsX() const { return _x; }
virtual int16 getAbsY() const { return _y; }
virtual int16 getChildX() const { return getAbsX(); }