Merge branch 'gcc7-conv-warn'

See https://github.com/wxWidgets/wxWidgets/pull/754
2018-03-06 20:02:22 +01:00
parent 2c515d730a 1f7a8a82c3
commit fe7cb6f159
3 changed files with 12 additions and 12 deletions
--- a/interface/wx/gdicmn.h
+++ b/interface/wx/gdicmn.h
@@ -1014,7 +1014,7 @@ public:
        @return A reference to this object (so that you can concatenate other
                 operations in the same line).
    */
-    wxSize& Scale(float xscale, float yscale);
+    wxSize& Scale(double xscale, double yscale);

    /**
        Sets the width and height members.