krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1128 from MiroslavR/Woverloaded-virtual

Browse source 
Fix overloaded virtual function warning
This commit is contained in:
scrawl 2016-11-13 20:49:14 +01:00 committed by GitHub
commit 233c9e37b0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwgui/itemchargeview.cpp
View file

@ -99,7 +99,7 @@ namespace MWGui
line.mIcon->setUserString("ToolTipType", "ItemPtr"); line.mIcon->setUserString("ToolTipType", "ItemPtr");
line.mIcon->setUserData(line.mItemPtr); line.mIcon->setUserData(line.mItemPtr);
line.mIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &ItemChargeView::onIconClicked); line.mIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &ItemChargeView::onIconClicked);
line.mIcon->eventMouseWheel += MyGUI::newDelegate(this, &ItemChargeView::onMouseWheel); line.mIcon->eventMouseWheel += MyGUI::newDelegate(this, &ItemChargeView::onMouseWheelMoved);
line.mCharge = mScrollView->createWidget<Widgets::MWDynamicStat>("MW_ChargeBar", MyGUI::IntCoord(), MyGUI::Align::Default); line.mCharge = mScrollView->createWidget<Widgets::MWDynamicStat>("MW_ChargeBar", MyGUI::IntCoord(), MyGUI::Align::Default);
line.mCharge->setNeedMouseFocus(false); line.mCharge->setNeedMouseFocus(false);
@ -202,7 +202,7 @@ namespace MWGui
eventItemClicked(this, *sender->getUserData<MWWorld::Ptr>()); eventItemClicked(this, *sender->getUserData<MWWorld::Ptr>());
} }
void ItemChargeView::onMouseWheel(MyGUI::Widget* /*sender*/, int rel) void ItemChargeView::onMouseWheelMoved(MyGUI::Widget* /*sender*/, int rel)
{ {
if (mScrollView->getViewOffset().top + rel*0.3f > 0) if (mScrollView->getViewOffset().top + rel*0.3f > 0)
mScrollView->setViewOffset(MyGUI::IntPoint(0, 0)); mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));

2
apps/openmw/mwgui/itemchargeview.hpp
View file

@ -64,7 +64,7 @@ namespace MWGui
void updateLine(const Line& line); void updateLine(const Line& line);
void onIconClicked(MyGUI::Widget* sender); void onIconClicked(MyGUI::Widget* sender);
void onMouseWheel(MyGUI::Widget* sender, int rel); void onMouseWheelMoved(MyGUI::Widget* sender, int rel);
typedef std::vector<Line> Lines; typedef std::vector<Line> Lines;
Lines mLines; Lines mLines;