diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-18 01:12:45 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-18 22:05:06 +0300 |
| commit | f24b4360e73d45bc0830d2964c06e295890e5f18 (patch) | |
| tree | 6ce4f8440b22ec665aa94403643c6cb0df1b47f0 /src/gui/windows/npcdialog.cpp | |
| parent | 14a0a04b2bb3928f7429fd748dd40e1843fca571 (diff) | |
| download | manaverse-f24b4360e73d45bc0830d2964c06e295890e5f18.tar.gz manaverse-f24b4360e73d45bc0830d2964c06e295890e5f18.tar.bz2 manaverse-f24b4360e73d45bc0830d2964c06e295890e5f18.tar.xz manaverse-f24b4360e73d45bc0830d2964c06e295890e5f18.zip | |
derive Widget from Widget2.
Diffstat (limited to 'src/gui/windows/npcdialog.cpp')
| -rw-r--r-- | src/gui/windows/npcdialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index d1823d5cf..a1b2109fb 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -84,12 +84,12 @@ NpcDialog::NpcDialog(const int npcId) : mDefaultString(), mTextBox(new BrowserBox(this, BrowserBox::AUTO_WRAP, true, "browserbox.xml")), - mScrollArea(new ScrollArea(mTextBox, + mScrollArea(new ScrollArea(this, mTextBox, getOptionBool("showtextbackground"), "npc_textbackground.xml")), mText(), mNewText(), mItemList(new ExtendedListBox(this, this, "extendedlistbox.xml")), - mListScrollArea(new ScrollArea(mItemList, + mListScrollArea(new ScrollArea(this, mItemList, getOptionBool("showlistbackground"), "npc_listbackground.xml")), mItems(), mImages(), @@ -111,7 +111,7 @@ NpcDialog::NpcDialog(const int npcId) : mResetButton(new Button(this, _("Reset"), "reset", this)), mInventory(new Inventory(Inventory::NPC, 1)), mItemContainer(new ItemContainer(this, mInventory)), - mItemScrollArea(new ScrollArea(mItemContainer, + mItemScrollArea(new ScrollArea(this, mItemContainer, getOptionBool("showitemsbackground"), "npc_listbackground.xml")), mInputState(NPC_INPUT_NONE), mActionState(NPC_ACTION_WAIT), |