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

Add field name to place error

Browse Source
This commit is contained in:
qPCR4vir 2019-04-09 13:11:20 +02:00
parent d18a4e9506
commit 77dd467f73
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/gui/place.cpp
View File

@ -42,7 +42,7 @@ namespace nana
void check_field_name(const char* name) void check_field_name(const char* name)
{ {
if (*name && (*name != '_' && !(('a' <= *name && *name <= 'z') || ('A' <= *name && *name <= 'Z')))) if (*name && (*name != '_' && !(('a' <= *name && *name <= 'z') || ('A' <= *name && *name <= 'Z'))))
throw std::invalid_argument("nana.place: bad field name"); throw std::invalid_argument(std::string("nana.place: bad field name '")+name+"'.");
} }
}//end namespace place_parts }//end namespace place_parts
@ -3358,7 +3358,7 @@ namespace nana
//if name violate the naming convention. //if name violate the naming convention.
place_parts::check_field_name(name); place_parts::check_field_name(name);
//get the field with specified name, if no such field with specified name //get the field with the specified name. If no such field with specified name
//then create one. //then create one.
auto & p = impl_->fields[name]; auto & p = impl_->fields[name];
if (nullptr == p) if (nullptr == p)
@ -3367,12 +3367,12 @@ namespace nana
if ((!p->attached) && impl_->root_division) if ((!p->attached) && impl_->root_division)
{ {
//search the division with the specified name, //search the division with the specified name,
//and attached the division to the field //and attaches the division to the field
auto div = implement::search_div_name(impl_->root_division.get(), name); auto div = implement::search_div_name(impl_->root_division.get(), name);
if (div) if (div)
{ {
if (div->field && (div->field != p)) if (div->field && (div->field != p))
throw std::runtime_error("nana.place: unexpected error, the division attaches an unexpected field."); throw std::runtime_error(std::string("nana.place: unexpected error, the division attaches an unexpected field: ") + name);
div->field = p; div->field = p;
p->attached = div; p->attached = div;