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

Renamed expr_color to color

Browse Source
This commit is contained in:
cnjinhao
2014-12-24 02:07:39 +08:00
parent 34c8392f35
commit ad7c36be3f
49 changed files with 296 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/detail/linux_X11/platform_spec.cpp
View File

@@ -301,12 +301,12 @@ namespace detail
#endif
}
void drawable_impl_type::set_color(const ::nana::expr_color& clr)
void drawable_impl_type::set_color(const ::nana::color& clr)
{
color_ = clr.px_color().value;
}
void drawable_impl_type::set_text_color(const ::nana::expr_color& clr)
void drawable_impl_type::set_text_color(const ::nana::color& clr)
{
text_color_ = clr.px_color().value;
update_text_color();
@@ -363,7 +363,7 @@ namespace detail
}
}
void drawable_impl_type::fgcolor(const ::nana::expr_color& clr)
void drawable_impl_type::fgcolor(const ::nana::color& clr)
{
auto rgb = clr.px_color().value;

6
source/detail/win32/platform_spec.cpp
View File

@@ -48,7 +48,7 @@ namespace detail
::DeleteObject(round_region.handle);
}
void drawable_impl_type::fgcolor(const ::nana::expr_color& clr)
void drawable_impl_type::fgcolor(const ::nana::color& clr)
{
set_text_color(clr);
}
@@ -58,12 +58,12 @@ namespace detail
return color_;
}
void drawable_impl_type::set_color(const ::nana::expr_color& clr)
void drawable_impl_type::set_color(const ::nana::color& clr)
{
color_ = clr.px_color().value;
}
void drawable_impl_type::set_text_color(const ::nana::expr_color& clr)
void drawable_impl_type::set_text_color(const ::nana::color& clr)
{
auto rgb = clr.px_color().value;
if (text_color_ != rgb)