From e70d597c2ee3a872d5aa1e92508e4051a4f2e6cc Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 2 Jul 2015 17:07:32 +0200
Subject: [PATCH] Fix propgrid sample compilation.

Resolve ambiguity in assignment of wxImage to wxBitmap in wxMSW which also has
wxBitmap::operator=(wxCursor). This should allow the sample to compile under
MSW after the changes of 1fce152d3c151db0466918c6edcdffd9015cd153.
---
 samples/propgrid/propgrid.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp
index 8bf78fdf4b..e14ce041b2 100644
--- a/samples/propgrid/propgrid.cpp
+++ b/samples/propgrid/propgrid.cpp
@@ -1185,7 +1185,7 @@ static void RescaleBitmap(const wxBitmap& srcBmp, wxBitmap& dstBmp)
         // Use high-quality wxImage scaling functions
         wxImage img = srcBmp.ConvertToImage();
         img.Rescale(dstBmp.GetWidth(), dstBmp.GetHeight(), wxIMAGE_QUALITY_HIGH);
-        dstBmp = img;
+        dstBmp = wxBitmap(img);
 #else
         // Old method of scaling the image
         double scaleX = (double)dstBmp.GetWidth() / (double)srcBmp.GetWidth();