replace string parameter of image's constructor with filesystem::path

2015-11-30 00:58:29 +08:00
parent c86a00bea5
commit b35f293b9e
11 changed files with 103 additions and 67 deletions
--- a/source/gui/widgets/listbox.cpp
+++ b/source/gui/widgets/listbox.cpp
@@ -3155,7 +3155,7 @@ namespace nana
 											graph->rectangle(rectangle{ item_xpos + static_cast<int>(header.pixels), y + 2,
 												ts.width + static_cast<unsigned>(content_pos)-header.pixels, essence_->item_size - 4 }, true);
 										}
-										extreme_text = std::max(extreme_text, item_xpos + content_pos + ts.width);
+										extreme_text = (std::max)(extreme_text, item_xpos + content_pos + ts.width);
 									}
 								}
 							}