Zhiyi Zhang : comctl32/button: Support displaying both image and text.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1f323f31d6311fe3c3a33f237583afe489325265
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1f323f31d6311fe3c3a33f237583afe489325265

Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date:   Wed Sep  5 22:57:39 2018 +0800

comctl32/button: Support displaying both image and text.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45727
Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/comctl32/button.c | 421 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 295 insertions(+), 126 deletions(-)

Diff:   https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f323f31d6311fe3c3a33f237583afe489325265