diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-05-04 17:32:03 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-05-04 17:32:03 +0000 |
| commit | cc493fae6ed87c2a101ea1ce1a6c2bb821bd51d5 (patch) | |
| tree | cbc8d381cb22fe27bac58e5061b9fc1032a5b5f1 /src/gui/scrollarea.h | |
| parent | 4dbb3e75160e465dbcdb6de282d2e4ad8f89bdc0 (diff) | |
| download | mana-cc493fae6ed87c2a101ea1ce1a6c2bb821bd51d5.tar.gz mana-cc493fae6ed87c2a101ea1ce1a6c2bb821bd51d5.tar.bz2 mana-cc493fae6ed87c2a101ea1ce1a6c2bb821bd51d5.tar.xz mana-cc493fae6ed87c2a101ea1ce1a6c2bb821bd51d5.zip | |
Merged revisions 4031-4044,4046-4058,4061-4062,4064,4066-4067,4069-4070,4072-4079,4082-4092,4094-4097,4099,4101-4109,4112-4115,4117-4129,4131-4150 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0
........
r4031 | the_enemy | 2008-04-03 14:53:00 +0200 (Thu, 03 Apr 2008) | 1 line
Tweaked disconnect dialog to fix crash bug id=250
........
r4050 | b_lindeijer | 2008-04-07 19:37:23 +0200 (Mon, 07 Apr 2008) | 2 lines
Merged changes made for the 0.0.24.1 release (4046:4048 from 0.0.24 branch).
........
r4066 | b_lindeijer | 2008-04-10 23:48:36 +0200 (Thu, 10 Apr 2008) | 2 lines
Fixed compile warning.
........
r4076 | b_lindeijer | 2008-04-12 20:36:15 +0200 (Sat, 12 Apr 2008) | 3 lines
Fixed display of item shortcut container. gcn::Widget::setWidth is no longer
virtual.
........
r4079 | crush_tmw | 2008-04-14 09:50:25 +0200 (Mon, 14 Apr 2008) | 1 line
Fixed multi-channel image dyeing (patch by fate)
........
r4096 | b_lindeijer | 2008-04-16 10:39:59 +0200 (Wed, 16 Apr 2008) | 3 lines
Restored the text wrapping in TextBox, since it was based on overriding a
method that is no longer virtual in Guichan 0.8.0 (gcn::TextBox::setText()).
........
r4097 | peaveydk | 2008-04-16 13:27:31 +0200 (Wed, 16 Apr 2008) | 1 line
Fix a basic_string::at sometimes being out of range in BrowserBox::draw when checking for line separators.
........
r4099 | peaveydk | 2008-04-16 13:50:12 +0200 (Wed, 16 Apr 2008) | 1 line
Also fix potential out of range in BrowserBox::draw when checking for color codes.
........
r4150 | b_lindeijer | 2008-04-20 21:24:33 +0200 (Sun, 20 Apr 2008) | 2 lines
Forgot to remove the sound effects apparently, removed now.
........
Diffstat (limited to 'src/gui/scrollarea.h')
| -rw-r--r-- | src/gui/scrollarea.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h index 9fb7093d..be361f68 100644 --- a/src/gui/scrollarea.h +++ b/src/gui/scrollarea.h @@ -34,17 +34,18 @@ class ImageRect; * * \ingroup GUI */ -class ScrollArea : public gcn::ScrollArea { +class ScrollArea : public gcn::ScrollArea +{ public: /** * Constructor. */ - ScrollArea(bool gc=true); + ScrollArea(bool gc = true); /** * Constructor. */ - ScrollArea(gcn::Widget *content, bool gc=true); + ScrollArea(gcn::Widget *content, bool gc = true); /** * Destructor. @@ -70,14 +71,12 @@ class ScrollArea : public gcn::ScrollArea { /** * Sets whether the widget should draw its background or not. */ - void - setOpaque(bool opaque); + void setOpaque(bool opaque); /** * Returns whether the widget draws its background or not. */ - bool - isOpaque() { return mOpaque; } + bool isOpaque() const { return mOpaque; } protected: enum BUTTON_DIR { |