diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-20 00:14:41 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-20 13:55:42 +0300 |
| commit | 504219f9df4b9dda139dd832e263a136e51c4851 (patch) | |
| tree | 36daaa884d7c3fa64e6d6f2ba3ccb382e2201d8f /src/gui/widgets | |
| parent | d59cd9111c1e86b224ea62cc975c49b157e2b3cf (diff) | |
| download | manaplus-504219f9df4b9dda139dd832e263a136e51c4851.tar.gz manaplus-504219f9df4b9dda139dd832e263a136e51c4851.tar.bz2 manaplus-504219f9df4b9dda139dd832e263a136e51c4851.tar.xz manaplus-504219f9df4b9dda139dd832e263a136e51c4851.zip | |
Add palette inheritance to browserbox class.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/browserbox.cpp | 5 | ||||
| -rw-r--r-- | src/gui/widgets/browserbox.h | 3 | ||||
| -rw-r--r-- | src/gui/widgets/chattab.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 0f72ad649..578ddd4a9 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -45,9 +45,10 @@ #include "debug.h" -BrowserBox::BrowserBox(const unsigned int mode, const bool opaque) : +BrowserBox::BrowserBox(const Widget2 *const widget, const unsigned int mode, + const bool opaque) : gcn::Widget(), - Widget2(), + Widget2(widget), gcn::MouseListener(), mLinkHandler(nullptr), mMode(mode), diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index b6d504a15..ceb4b1b3f 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -84,7 +84,8 @@ class BrowserBox final : public gcn::Widget, /** * Constructor. */ - BrowserBox(const unsigned int mode = AUTO_SIZE, + BrowserBox(const Widget2 *const widget, + const unsigned int mode = AUTO_SIZE, const bool opaque = true); A_DELETE_COPY(BrowserBox) diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 63b5f8e05..8d983921e 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -51,7 +51,7 @@ static const unsigned int MAX_WORD_SIZE = 50; ChatTab::ChatTab(const Widget2 *const widget, const std::string &name) : Tab(widget), - mTextOutput(new BrowserBox(BrowserBox::AUTO_WRAP)), + mTextOutput(new BrowserBox(this, BrowserBox::AUTO_WRAP)), mScrollArea(new ScrollArea(mTextOutput, false)), mAllowHightlight(true), mRemoveNames(false), |