small fixes

This commit is contained in:
Jinhao
2016-05-22 04:40:19 +08:00
parent 5e33bc643f
commit a0a1f01097
2 changed files with 7 additions and 7 deletions

View File

@@ -621,24 +621,24 @@ namespace nana
return *this;
}
point rectangle::position() const
point rectangle::position() const noexcept
{
return{ x, y };
}
rectangle& rectangle::position(const point& p)
rectangle& rectangle::position(const point& p) noexcept
{
x = p.x;
y = p.y;
return *this;
}
size rectangle::dimension() const
size rectangle::dimension() const noexcept
{
return{width, height};
}
rectangle& rectangle::dimension(const size& sz)
rectangle& rectangle::dimension(const size& sz) noexcept
{
width = sz.width;
height = sz.height;

View File

@@ -387,7 +387,7 @@ namespace nana
}
panels_.emplace_back();
auto wdg = wdg.get();
auto wdg_ptr = wdg.get();
panels_.back().widget_ptr.swap(wdg);
for (auto & pn : panels_)
@@ -395,7 +395,7 @@ namespace nana
if (pn.widget_ptr)
pn.widget_ptr->move(r);
}
return wdg;
return wdg_ptr;
}
return nullptr;
}