Merge branch 'hotfixes-0.9.1' into develop

Conflicts:
	include/nana/gui/widgets/progress.hpp
	source/gui/widgets/date_chooser.cpp
	source/gui/widgets/progress.cpp
	source/gui/widgets/treebox.cpp
This commit is contained in:
cnjinhao
2015-02-02 18:55:23 +08:00
15 changed files with 201 additions and 71 deletions

View File

@@ -1,6 +1,7 @@
/*
* Paint Image Implementation
* Copyright(C) 2003-2013 Jinhao(cnjinhao@hotmail.com)
* Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
*
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
@@ -62,6 +63,8 @@ namespace paint
::DeleteObject(info.hbmMask);
return true;
}
#else
if(is_ico_){} //kill the unused compiler warning in Linux.
#endif
return false;
}