Make wxBitmap ctors consistent wrt passing scale for conversion from wxImage; HiDPI adaptation for propgrid buffer and wxRTC images

2015-11-15 12:49:25 +00:00
parent fdbed751dc
commit a797c9d956
13 changed files with 38 additions and 22 deletions
--- a/src/qt/bitmap.cpp
+++ b/src/qt/bitmap.cpp
@@ -220,7 +220,7 @@ wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type )
    LoadFile(filename, type);
 }

-wxBitmap::wxBitmap(const wxImage& image, int depth )
+wxBitmap::wxBitmap(const wxImage& image, int depth, double WXUNUSED(scale) )
 {
    Qt::ImageConversionFlags flags = 0;
    if (depth == 1)