diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
| commit | fa2f3ac593a792c32095c2e885665ec91bb4019d (patch) | |
| tree | f44aee845f0229dfcc6b2ad3c74613e0352f36c2 /src/gui/scrollarea.h | |
| parent | 07f7d52f661a74e6d0c780ca53e724651e3dcc48 (diff) | |
| parent | 40edf4e91558cffd83d9015a2cf4a16360e27855 (diff) | |
| download | mana-client-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.gz mana-client-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.bz2 mana-client-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.xz mana-client-fa2f3ac593a792c32095c2e885665ec91bb4019d.zip | |
Merged with Aethyra master as of 2009-02-09
Conflicts:
A lot of files...
Diffstat (limited to 'src/gui/scrollarea.h')
| -rw-r--r-- | src/gui/scrollarea.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h index 4fababfa..33ebc692 100644 --- a/src/gui/scrollarea.h +++ b/src/gui/scrollarea.h @@ -24,8 +24,6 @@ #include <guichan/widgets/scrollarea.hpp> -#include "../guichanfwd.h" - class Image; class ImageRect; @@ -40,12 +38,12 @@ class ScrollArea : public gcn::ScrollArea /** * Constructor. */ - ScrollArea(bool gc = true); + ScrollArea(bool gc = true, bool opaque = true); /** * Constructor. */ - ScrollArea(gcn::Widget *content, bool gc = true); + ScrollArea(gcn::Widget *content, bool gc = true, bool opaque = true); /** * Destructor. @@ -102,6 +100,7 @@ class ScrollArea : public gcn::ScrollArea void drawHMarker(gcn::Graphics *graphics); static int instances; + static float mAlpha; static ImageRect background; static ImageRect vMarker; static Image *buttons[4][2]; |