Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix propgrid sample compilation.

Browse Source 
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 1fce152d3c.
This commit is contained in:
Vadim Zeitlin
2015-07-02 17:07:32 +02:00
parent de5571a744
commit e70d597c2e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/propgrid/propgrid.cpp
View File

@@ -1185,7 +1185,7 @@ static void RescaleBitmap(const wxBitmap& srcBmp, wxBitmap& dstBmp)
// Use high-quality wxImage scaling functions // Use high-quality wxImage scaling functions
wxImage img = srcBmp.ConvertToImage(); wxImage img = srcBmp.ConvertToImage();
img.Rescale(dstBmp.GetWidth(), dstBmp.GetHeight(), wxIMAGE_QUALITY_HIGH); img.Rescale(dstBmp.GetWidth(), dstBmp.GetHeight(), wxIMAGE_QUALITY_HIGH);
dstBmp = img; dstBmp = wxBitmap(img);
#else #else
// Old method of scaling the image // Old method of scaling the image
double scaleX = (double)dstBmp.GetWidth() / (double)srcBmp.GetWidth(); double scaleX = (double)dstBmp.GetWidth() / (double)srcBmp.GetWidth();