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

6
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) });
} }
@ -191,4 +191,4 @@ namespace nana
} }
} }
//end class screen //end class screen
} }

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

@ -218,7 +218,7 @@ namespace nana{ namespace widgets
editor_._m_move_select(false); editor_._m_move_select(false);
return; return;
} }
editor_.select_.a = dest_a_; editor_.select_.a = dest_a_;
editor_.select_.b = dest_b_; editor_.select_.b = dest_b_;
editor_.points_.caret = sel_a_; editor_.points_.caret = sel_a_;
@ -257,7 +257,7 @@ namespace nana{ namespace widgets
virtual bool adjust_caret_into_screen() = 0; virtual bool adjust_caret_into_screen() = 0;
}; };
class text_editor::behavior_normal class text_editor::behavior_normal
: public editor_behavior_interface : public editor_behavior_interface
{ {
@ -638,7 +638,7 @@ namespace nana{ namespace widgets
} }
auto & mtr = linemtr_[line]; auto & mtr = linemtr_[line];
mtr.take_lines = line_sections.size(); mtr.take_lines = line_sections.size();
mtr.line_sections.swap(line_sections); mtr.line_sections.swap(line_sections);
@ -946,7 +946,7 @@ namespace nana{ namespace widgets
void _m_set_offset_by_secondary(std::size_t primary, std::size_t secondary) void _m_set_offset_by_secondary(std::size_t primary, std::size_t secondary)
{ {
std::size_t lines = 0; std::size_t lines = 0;
for_each(linemtr_.begin(), linemtr_.begin() + primary, [&lines](const line_metrics& mtr) mutable for_each(linemtr_.begin(), linemtr_.begin() + primary, [&lines](const line_metrics& mtr) mutable
{ {
lines += mtr.take_lines; lines += mtr.take_lines;
@ -1112,7 +1112,7 @@ namespace nana{ namespace widgets
} }
else else
screen_line = static_cast<std::size_t>((y - text_area.area.y) / static_cast<int>(editor_.line_height()) + points.offset.y); screen_line = static_cast<std::size_t>((y - text_area.area.y) / static_cast<int>(editor_.line_height()) + points.offset.y);
std::size_t primary = 0; std::size_t primary = 0;
for (auto & mtr : linemtr_) for (auto & mtr : linemtr_)
{ {
@ -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)
{ {
@ -1369,7 +1356,7 @@ namespace nana{ namespace widgets
select(true); select(true);
return true; return true;
} }
if (attributes_.editable && enterable) if (attributes_.editable && enterable)
{ {
switch (key) switch (key)
@ -1451,7 +1438,7 @@ namespace nana{ namespace widgets
{ {
if (!textbase_.load(fs)) if (!textbase_.load(fs))
return false; return false;
_m_reset(); _m_reset();
behavior_->pre_calc_lines(width_pixels()); behavior_->pre_calc_lines(width_pixels());
render(API::is_focus_window(window_)); render(API::is_focus_window(window_));
@ -1498,7 +1485,7 @@ namespace nana{ namespace widgets
if (attributes_.multi_lines == ml) if (attributes_.multi_lines == ml)
return false; return false;
attributes_.multi_lines = ml; attributes_.multi_lines = ml;
if (!ml) if (!ml)
@ -1531,7 +1518,7 @@ namespace nana{ namespace widgets
{ {
undo_.enable(enb); undo_.enable(enb);
} }
bool text_editor::undo_enabled() const bool text_editor::undo_enabled() const
{ {
return undo_.enabled(); return undo_.enabled();
@ -1584,7 +1571,7 @@ namespace nana{ namespace widgets
{ {
if (!hit_text_area(scrpos)) if (!hit_text_area(scrpos))
return false; return false;
if(left_button) if(left_button)
{ {
API::capture_window(window_, true); API::capture_window(window_, true);
@ -1613,7 +1600,7 @@ namespace nana{ namespace widgets
cursor cur = cursor::iterm; cursor cur = cursor::iterm;
if ((!hit_text_area(scrpos)) && (!text_area_.captured)) if ((!hit_text_area(scrpos)) && (!text_area_.captured))
cur = cursor::arrow; cur = cursor::arrow;
API::window_cursor(window_, cur); API::window_cursor(window_, cur);
if(left_button) if(left_button)
@ -1720,7 +1707,7 @@ namespace nana{ namespace widgets
else if (API::caret_size(window_).height != line_pixels) else if (API::caret_size(window_).height != line_pixels)
reset_caret_height(); reset_caret_height();
} }
API::caret_visible(window_, visible); API::caret_visible(window_, visible);
if(visible) if(visible)
@ -1883,7 +1870,7 @@ namespace nana{ namespace widgets
void text_editor::put(nana::string text) void text_editor::put(nana::string text)
{ {
auto undo_ptr = std::unique_ptr<undo_input_text>{ new undo_input_text(*this, text) }; auto undo_ptr = std::unique_ptr<undo_input_text>{ new undo_input_text(*this, text) };
undo_ptr->set_selected_text(); undo_ptr->set_selected_text();
//Do not forget to assign the _m_erase_select() to caret //Do not forget to assign the _m_erase_select() to caret
@ -1910,11 +1897,11 @@ namespace nana{ namespace widgets
{ {
auto undo_ptr = std::unique_ptr < undo_input_text > {new undo_input_text(*this, nana::string(1, c))}; auto undo_ptr = std::unique_ptr < undo_input_text > {new undo_input_text(*this, nana::string(1, c))};
bool refresh = (select_.a != select_.b); bool refresh = (select_.a != select_.b);
undo_ptr->set_selected_text(); undo_ptr->set_selected_text();
if(refresh) if(refresh)
points_.caret = _m_erase_select(); points_.caret = _m_erase_select();
undo_ptr->set_caret_pos(); undo_ptr->set_caret_pos();
undo_.push(std::move(undo_ptr)); undo_.push(std::move(undo_ptr));
@ -1950,7 +1937,7 @@ namespace nana{ namespace widgets
{ {
nana::string text; nana::string text;
nana::system::dataexch().get(text); nana::system::dataexch().get(text);
if (!text.empty()) if (!text.empty())
put(std::move(text)); put(std::move(text));
} }
@ -2482,7 +2469,7 @@ namespace nana{ namespace widgets
nana::upoint a, b; nana::upoint a, b;
if (!_m_get_sort_select_points(a, b)) if (!_m_get_sort_select_points(a, b))
return false; return false;
if(a.y != b.y) if(a.y != b.y)
{ {
text = textbase_.getline(a.y).substr(a.x); text = textbase_.getline(a.y).substr(a.x);
@ -2699,7 +2686,7 @@ namespace nana{ namespace widgets
std::unique_ptr<unsigned[]> glyph_px(new unsigned[len]); std::unique_ptr<unsigned[]> glyph_px(new unsigned[len]);
graph_.glyph_pixels(str, len, glyph_px.get()); graph_.glyph_pixels(str, len, glyph_px.get());
auto glyphs = glyph_px.get(); auto glyphs = glyph_px.get();
auto px_h = line_height(); auto px_h = line_height();
auto px_w = std::accumulate(glyphs, glyphs + len, unsigned{}); auto px_w = std::accumulate(glyphs, glyphs + len, unsigned{});

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)
{ {
} }