From 592b904602238e7763f3dd04bb6d804aabe2327b Mon Sep 17 00:00:00 2001 From: besh81 Date: Thu, 29 Nov 2018 15:39:04 +0100 Subject: [PATCH] changed variable name int arg_tabbar* changed variable name int arg_tabbar* from pos to item_pos to avoid inconsistencies with arg_mouse.pos --- include/nana/gui/widgets/tabbar.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/nana/gui/widgets/tabbar.hpp b/include/nana/gui/widgets/tabbar.hpp index 093993f4..863b66ec 100644 --- a/include/nana/gui/widgets/tabbar.hpp +++ b/include/nana/gui/widgets/tabbar.hpp @@ -29,10 +29,10 @@ namespace nana { tabbar & widget; T & value; - std::size_t pos; ///< position of the item + std::size_t item_pos; ///< position of the item arg_tabbar(tabbar& wdg, T& v, std::size_t p) - : widget(wdg), value{ v }, pos(p) + : widget(wdg), value{ v }, item_pos(p) {} }; @@ -53,12 +53,12 @@ namespace nana : public arg_mouse { arg_tabbar_mouse(const arg_mouse& arg, tabbar& wdg, T& v, std::size_t p) - : arg_mouse{ arg }, widget(wdg), value{ v }, pos(p) + : arg_mouse{ arg }, widget(wdg), value{ v }, item_pos(p) {} tabbar & widget; T & value; - std::size_t pos; ///< position of the item + std::size_t item_pos; ///< position of the item }; template