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

fix missing ~other_tag, remove some warings

Browse Source
This commit is contained in:
Jinhao
2016-06-25 06:00:40 +08:00
parent d701650cd5
commit 4a6331e625
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/nana/gui/detail/basic_window.hpp
View File

@@ -244,6 +244,7 @@ namespace detail
}attribute; }attribute;
other_tag(category::flags); other_tag(category::flags);
~other_tag();
}other; }other;
native_window_type root; ///< root Window handle native_window_type root; ///< root Window handle

2
source/deploy.cpp
View File

@@ -449,7 +449,7 @@ namespace std
//template< > //template< >
std::string put_time/*<char, std::string>*/(const std::tm* tmb, const char* fmt) std::string put_time/*<char, std::string>*/(const std::tm* tmb, const char* fmt)
{ {
unsigned sz = 200; std::size_t sz = 200;
std::string str(sz, '\0'); std::string str(sz, '\0');
sz = std::strftime(&str[0], str.size() - 1, fmt, tmb); sz = std::strftime(&str[0], str.size() - 1, fmt, tmb);
str.resize(sz); str.resize(sz);

2
source/gui/widgets/listbox.cpp
View File

@@ -2078,7 +2078,7 @@ namespace nana
unsigned x_offset() const unsigned x_offset() const
{ {
return (h.empty() ? 0 : h.value()); return static_cast<unsigned>(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. index_pair offset_y_abs, offset_y_dpl; //cat stands for category, item stands for item. "item == npos" means that is a category.

2
source/gui/widgets/skeletons/text_editor.cpp
View File

@@ -3451,7 +3451,7 @@ namespace nana{ namespace widgets
unsigned text_editor::_m_char_by_pixels(const unicode_bidi::entity& ent, unsigned pos) unsigned text_editor::_m_char_by_pixels(const unicode_bidi::entity& ent, unsigned pos)
{ {
unsigned len = ent.end - ent.begin; auto len = static_cast<std::size_t>(ent.end - ent.begin);
std::unique_ptr<unsigned[]> pxbuf(new unsigned[len]); std::unique_ptr<unsigned[]> pxbuf(new unsigned[len]);
if (graph_.glyph_pixels(ent.begin, len, pxbuf.get())) if (graph_.glyph_pixels(ent.begin, len, pxbuf.get()))

2
source/paint/text_renderer.cpp
View File

@@ -627,7 +627,7 @@ namespace nana
std::unique_ptr<unsigned[]> pixels(new unsigned[text.size()]); std::unique_ptr<unsigned[]> pixels(new unsigned[text.size()]);
graph_.glyph_pixels(text.c_str(), text.size(), pixels.get()); graph_.glyph_pixels(text.c_str(), text.size(), pixels.get());
unsigned substr_len = 0; std::size_t substr_len = 0;
unsigned substr_px = 0; unsigned substr_px = 0;
if (align::right == text_align_ex_) if (align::right == text_align_ex_)