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/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -81,7 +81,7 @@ public:

 #if wxUSE_IMAGE
    // Convert from wxImage
-    wxBitmap(const wxImage& image, int depth = -1)
+    wxBitmap(const wxImage& image, int depth = -1, double WXUNUSED(scale) = 1.0)
        { (void)CreateFromImage(image, depth); }

    // Create a DDB compatible with the given DC from wxImage