mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfix-1.1.2' into develop

Browse Source
This commit is contained in:
Jinhao
2015-08-28 07:35:31 +08:00
parent 16c93537c9 549acf5aef
commit 5c6c0ddcd1
7 changed files with 79 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/gui/widgets/tabbar.cpp
View File

@@ -1440,7 +1440,6 @@ namespace nana
private:
void _m_calc_metrics(graph_reference graph, std::forward_list<item>& items)
{
const auto height_px = graph.height();
std::vector<unsigned> pxs;
unsigned pixels = 0;

8
source/gui/widgets/widget.cpp
View File

@@ -22,10 +22,10 @@ namespace nana
//class widget
//@brief:The definition of class widget
class widget::notifier: public detail::widget_notifier_interface
class widget::inner_widget_notifier : public detail::widget_notifier_interface
{
public:
notifier(widget& wdg)
inner_widget_notifier(widget& wdg)
: wdg_(wdg)
{}
@@ -246,7 +246,7 @@ namespace nana
std::unique_ptr<::nana::detail::widget_notifier_interface> widget::_m_wdg_notifier()
{
return std::unique_ptr<::nana::detail::widget_notifier_interface>(new notifier(*this));
return std::unique_ptr<::nana::detail::widget_notifier_interface>(new inner_widget_notifier(*this));
}
void widget::_m_complete_creation()
@@ -348,7 +348,7 @@ namespace nana
{
std::unique_ptr<widget_notifier_interface> widget_notifier_interface::get_notifier(widget* wdg)
{
return std::unique_ptr<widget_notifier_interface>(new widget::notifier(*wdg));
return std::unique_ptr<widget_notifier_interface>(new widget::inner_widget_notifier(*wdg));
}
}
}//end namespace nana