Renamed expr_color to color

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

View File

@@ -118,12 +118,12 @@ namespace nana
{
graphics & graph;
int x, endpos;
::nana::expr_color fgcolor;
::nana::color fgcolor;
unsigned omitted_pixels;
nana::unicode_bidi bidi;
std::vector<nana::unicode_bidi::entity> reordered;
draw_string_omitted(graphics& graph, int x, int endpos, const ::nana::expr_color& fgcolor, bool omitted)
draw_string_omitted(graphics& graph, int x, int endpos, const ::nana::color& fgcolor, bool omitted)
: graph(graph), x(x), endpos(endpos), fgcolor(fgcolor)
{
omitted_pixels = (omitted ? graph.text_extent_size(STR("..."), 3).width : 0);