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/dfb/bitmap.cpp
+++ b/src/dfb/bitmap.cpp
@@ -420,7 +420,7 @@ bool wxBitmap::CreateWithFormat(int width, int height, int dfbFormat)
 }

 #if wxUSE_IMAGE
-wxBitmap::wxBitmap(const wxImage& imageOrig, int depth)
+wxBitmap::wxBitmap(const wxImage& imageOrig, int depth, double WXUNUSED(scale))
 {
    wxCHECK_RET( imageOrig.IsOk(), wxT("invalid image") );