diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-10-19 23:56:04 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-10-20 13:55:42 +0300 |
commit | d59cd9111c1e86b224ea62cc975c49b157e2b3cf (patch) | |
tree | d7186479633c0269573e92b5a5213d04b84b3995 /src/gui/shortcutwindow.cpp | |
parent | 71d2b482d84246b8456ea863f94a9a766d33f197 (diff) | |
download | ManaVerse-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.tar.gz ManaVerse-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.tar.bz2 ManaVerse-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.tar.xz ManaVerse-d59cd9111c1e86b224ea62cc975c49b157e2b3cf.zip |
Add to some controls palette inheritance from other controls.
Diffstat (limited to 'src/gui/shortcutwindow.cpp')
-rw-r--r-- | src/gui/shortcutwindow.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp index 8a4d45188..8f4374cba 100644 --- a/src/gui/shortcutwindow.cpp +++ b/src/gui/shortcutwindow.cpp @@ -41,8 +41,9 @@ int ShortcutWindow::mBoxesWidth = 0; class ShortcutTab final : public Tab { public: - ShortcutTab(std::string name, ShortcutContainer *const content) : - Tab(), + ShortcutTab(const Widget2 *const widget, + std::string name, ShortcutContainer *const content) : + Tab(widget), mContent(content) { setCaption(name); @@ -108,7 +109,7 @@ ShortcutWindow::ShortcutWindow(const std::string &title, std::string skinFile, Window("Window", false, nullptr, skinFile), mItems(nullptr), mScrollArea(nullptr), - mTabs(new TabbedArea) + mTabs(new TabbedArea(this)) { setWindowName(title); setTitleBarHeight(getPadding() + getTitlePadding()); @@ -155,7 +156,7 @@ void ShortcutWindow::addTab(std::string name, ShortcutContainer *const content) ScrollArea *const scroll = new ScrollArea(content, false); scroll->setPosition(SCROLL_PADDING, SCROLL_PADDING); scroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); - Tab *const tab = new ShortcutTab(name, content); + Tab *const tab = new ShortcutTab(this, name, content); mTabs->addTab(tab, scroll); } |