diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-08-16 18:25:55 +0200 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-08-16 18:25:55 +0200 |
| commit | 4263962e947b4914de8d1750f21cc7cc82567b4d (patch) | |
| tree | 32340098913c302fdb33f88ffea65fb36920db75 /src/gui/widgets/scrollarea.h | |
| parent | dd0844b6ac01293e7afd0dd85e695b8d77b8e4be (diff) | |
| parent | 7e2673a3b9460fdcd646e23c3bd9039de854565f (diff) | |
| download | mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.gz mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.bz2 mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.xz mana-4263962e947b4914de8d1750f21cc7cc82567b4d.zip | |
More merges and conflict resolves
Diffstat (limited to 'src/gui/widgets/scrollarea.h')
| -rw-r--r-- | src/gui/widgets/scrollarea.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h index 8fd92b5f..69e99b1f 100644 --- a/src/gui/widgets/scrollarea.h +++ b/src/gui/widgets/scrollarea.h @@ -23,6 +23,7 @@ #define SCROLLAREA_H #include <guichan/widgets/scrollarea.hpp> +#include <guichan/widgetlistener.hpp> class Image; class ImageRect; @@ -36,7 +37,7 @@ class ImageRect; * * \ingroup GUI */ -class ScrollArea : public gcn::ScrollArea +class ScrollArea : public gcn::ScrollArea, public gcn::WidgetListener { public: /** @@ -98,6 +99,8 @@ class ScrollArea : public gcn::ScrollArea */ void mouseExited(gcn::MouseEvent& event); + void widgetResized(const gcn::Event &event); + protected: enum BUTTON_DIR { UP, |