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

eliminate GCC warings when -Wimplicit-fallthrough is enabled

Browse Source
This commit is contained in:
Jinhao
2018-08-10 23:35:11 +08:00
parent 9bd6e0a2b0
commit 04e57771a4
7 changed files with 113 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/gui/place.cpp
View File

@@ -798,17 +798,20 @@ namespace nana
case number_t::kind::real:
return static_cast<unsigned>(number.real());
case number_t::kind::percent:
adjustable_px = area_px * number.real();
case number_t::kind::none:
{
auto fpx = adjustable_px + precise_px;
auto px = static_cast<unsigned>(fpx);
precise_px = fpx - px;
return px;
}
break;
default:
return 0; //Useless
}
return 0; //Useless
if(number_t::kind::percent == number.kind_of())
adjustable_px = area_px * number.real() + precise_px;
else
adjustable_px += precise_px;
auto const px = static_cast<unsigned>(adjustable_px);
precise_px = adjustable_px - px;
return px;
}
std::pair<double, double> calc_weight_floor()
@@ -2879,25 +2882,26 @@ namespace nana
}
field_gather * attached_field = nullptr;
if (name.size())
//find the field with specified name.
//the field may not be created.
auto i = fields.find(name);
if (fields.end() != i)
{
//find the field with specified name.
//the field may not be created.
auto i = fields.find(name);
if (fields.end() != i)
{
attached_field = i->second;
//the field is attached to a division, it means there is another division with same name.
if (attached_field->attached)
throw std::runtime_error("place, the name '" + name + "' is redefined.");
}
attached_field = i->second;
//the field is attached to a division, it means there is another division with same name.
if (attached_field->attached)
throw std::runtime_error("place, the name '" + name + "' is redefined.");
}
token unmatch = token::width;
switch (div_type)
{
case token::eof: unmatch = token::height; // "horitontal" div
case token::vert: // "vertical" div
case token::eof: // "horitontal" div
case token::vert: // "vertical" div
if(token::eof == div_type)
unmatch = token::height;
for (auto& ch : children)
if (ch->weigth_type == unmatch)
throw std::invalid_argument("nana.place: unmatch vertical-heigth/horizontal-width betwen division '"