From 48db4528d67fba1f82e3fc54131309d84b8dad61 Mon Sep 17 00:00:00 2001 From: qPCR4vir Date: Mon, 15 Feb 2016 11:30:16 +0100 Subject: [PATCH] fixing: tabbar append error in gcc linux - travis see: https://travis-ci.org/cnjinhao/nana/jobs/109245565 --- .gitignore | 2 +- include/nana/gui/widgets/tabbar.hpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 71a1545a..ef6de4d4 100644 --- a/.gitignore +++ b/.gitignore @@ -41,4 +41,4 @@ CMakeFiles/ .idea/ cmake_install.cmake *.DS_Store -.idea/ + diff --git a/include/nana/gui/widgets/tabbar.hpp b/include/nana/gui/widgets/tabbar.hpp index 79ed46f2..4fbb6fe7 100644 --- a/include/nana/gui/widgets/tabbar.hpp +++ b/include/nana/gui/widgets/tabbar.hpp @@ -263,13 +263,13 @@ namespace nana tabbar& append(std::string text, window attach_wd, value_type value = {}) { - return this->append(static_cast(nana::charset(text, nana::unicode::utf8)), attach_wd); + return this->append( std::wstring((nana::charset(std::move(text), nana::unicode::utf8))), attach_wd, std::move(value)); } tabbar& append(std::wstring text, window attach_wd, value_type value = {}) { if (attach_wd && API::empty_window(attach_wd)) - throw std::invalid_argument("tabbar.attach: invalid window handle"); + throw std::invalid_argument("Appening a tab to a tabbar - error: tabbar.attach: invalid window handle"); this->get_drawer_trigger().insert(::nana::npos, std::move(text), std::move(value)); if (attach_wd) @@ -299,7 +299,7 @@ namespace nana if (pos > length()) throw std::out_of_range("tabbar::insert invalid position"); - this->get_drawer_trigger().insert(pos, to_nstring(text), std::move(value)); + this->get_drawer_trigger().insert(pos, to_nstring(std::move(text)), std::move(value)); API::update_window(*this); }