diff --git a/include/nana/gui/detail/basic_window.hpp b/include/nana/gui/detail/basic_window.hpp index 280d015b..038acdbb 100644 --- a/include/nana/gui/detail/basic_window.hpp +++ b/include/nana/gui/detail/basic_window.hpp @@ -244,6 +244,7 @@ namespace detail }attribute; other_tag(category::flags); + ~other_tag(); }other; native_window_type root; ///< root Window handle diff --git a/source/deploy.cpp b/source/deploy.cpp index 7f098148..7f715ef9 100644 --- a/source/deploy.cpp +++ b/source/deploy.cpp @@ -449,7 +449,7 @@ namespace std //template< > std::string put_time/**/(const std::tm* tmb, const char* fmt) { - unsigned sz = 200; + std::size_t sz = 200; std::string str(sz, '\0'); sz = std::strftime(&str[0], str.size() - 1, fmt, tmb); str.resize(sz); diff --git a/source/gui/widgets/listbox.cpp b/source/gui/widgets/listbox.cpp index 9c710901..8cf10cbc 100644 --- a/source/gui/widgets/listbox.cpp +++ b/source/gui/widgets/listbox.cpp @@ -2078,7 +2078,7 @@ namespace nana unsigned x_offset() const { - return (h.empty() ? 0 : h.value()); + return static_cast(h.empty() ? 0 : h.value()); } index_pair offset_y_abs, offset_y_dpl; //cat stands for category, item stands for item. "item == npos" means that is a category. diff --git a/source/gui/widgets/skeletons/text_editor.cpp b/source/gui/widgets/skeletons/text_editor.cpp index 341fa22d..3062b445 100644 --- a/source/gui/widgets/skeletons/text_editor.cpp +++ b/source/gui/widgets/skeletons/text_editor.cpp @@ -3451,7 +3451,7 @@ namespace nana{ namespace widgets unsigned text_editor::_m_char_by_pixels(const unicode_bidi::entity& ent, unsigned pos) { - unsigned len = ent.end - ent.begin; + auto len = static_cast(ent.end - ent.begin); std::unique_ptr pxbuf(new unsigned[len]); if (graph_.glyph_pixels(ent.begin, len, pxbuf.get())) diff --git a/source/paint/text_renderer.cpp b/source/paint/text_renderer.cpp index 1716b34c..825639c6 100644 --- a/source/paint/text_renderer.cpp +++ b/source/paint/text_renderer.cpp @@ -627,7 +627,7 @@ namespace nana std::unique_ptr pixels(new unsigned[text.size()]); graph_.glyph_pixels(text.c_str(), text.size(), pixels.get()); - unsigned substr_len = 0; + std::size_t substr_len = 0; unsigned substr_px = 0; if (align::right == text_align_ex_)