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

Fixed some MinGW warnings

Browse Source
This commit is contained in:
cnjinhao 2015-01-12 05:30:45 +08:00
parent 0474299bdc
commit 7496fea110
3 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/gui/screen.cpp
View File

@ -119,8 +119,8 @@ namespace nana
if (::EnumDisplaySettings(disp.DeviceName, ENUM_CURRENT_SETTINGS, &mode)) if (::EnumDisplaySettings(disp.DeviceName, ENUM_CURRENT_SETTINGS, &mode))
{ {
if (mode.dmPosition.x == mi.rcWork.left && mode.dmPosition.y == mi.rcWork.top && if (mode.dmPosition.x == mi.rcWork.left && mode.dmPosition.y == mi.rcWork.top &&
(mode.dmPelsWidth == mi.rcWork.right - mi.rcWork.left) && (static_cast<int>(mode.dmPelsWidth) == mi.rcWork.right - mi.rcWork.left) &&
(mode.dmPelsHeight == mi.rcWork.bottom - mi.rcWork.top)) (static_cast<int>(mode.dmPelsHeight) == mi.rcWork.bottom - mi.rcWork.top))
{ {
return std::make_shared<real_display>(static_cast<std::size_t>(index - 1), rectangle{ mode.dmPosition.x, mode.dmPosition.y, static_cast<unsigned>(mode.dmPelsWidth), static_cast<unsigned>(mode.dmPelsHeight) }); return std::make_shared<real_display>(static_cast<std::size_t>(index - 1), rectangle{ mode.dmPosition.x, mode.dmPosition.y, static_cast<unsigned>(mode.dmPelsWidth), static_cast<unsigned>(mode.dmPelsHeight) });
} }

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

@ -1188,9 +1188,6 @@ namespace nana{ namespace widgets
if (pos + len < text.size()) if (pos + len < text.size())
{ {
auto chr = text[pos + len]; auto chr = text[pos + len];
auto is = std::iswalpha(chr);
is = std::isspace(chr);
if ((std::iswalpha(chr) && !std::isspace(chr)) || chr == '_') if ((std::iswalpha(chr) && !std::isspace(chr)) || chr == '_')
return false; return false;
} }
@ -1198,16 +1195,6 @@ namespace nana{ namespace widgets
return true; return true;
}; };
auto test_overlapped = [&entities](const ::nana::char_t* begin, const ::nana::char_t* end)
{
for (auto & en : entities)
{
if ((begin <= en.begin && en.begin < end) || (begin <= en.end && en.end < end))
return true;
}
return false;
};
::nana::cistring cistr; ::nana::cistring cistr;
for (auto & ds : kwptr->kwbase) for (auto & ds : kwptr->kwbase)
{ {

5
source/gui/widgets/treebox.cpp
View File

@ -1284,9 +1284,10 @@ namespace nana
typedef tree_cont_type::node_type node_type; typedef tree_cont_type::node_type node_type;
item_renderer(implement * impl, const nana::point& pos) item_renderer(implement * impl, const nana::point& pos)
: impl_(impl), pos_(pos), : impl_(impl),
bgcolor_(impl->data.widget_ptr->bgcolor()), bgcolor_(impl->data.widget_ptr->bgcolor()),
fgcolor_(impl->data.widget_ptr->fgcolor()) fgcolor_(impl->data.widget_ptr->fgcolor()),
pos_(pos)
{ {
} }