diff options
| author | B Stack <bgstack15@gmail.com> | 2021-02-02 21:49:34 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2021-02-02 21:49:34 +0000 |
| commit | 26b8bd6eb07b78adad36049e03494a2931b231af (patch) | |
| tree | 4d7c950512836f473a6a8cbb521c61e800db6584 /wx+/dc.h | |
| parent | Merge branch '11.5' into 'master' (diff) | |
| parent | add upstream 11.6 (diff) | |
| download | FreeFileSync-26b8bd6eb07b78adad36049e03494a2931b231af.tar.gz FreeFileSync-26b8bd6eb07b78adad36049e03494a2931b231af.tar.bz2 FreeFileSync-26b8bd6eb07b78adad36049e03494a2931b231af.zip | |
Merge branch '11.6' into 'master'11.6
add upstream 11.6
See merge request opensource-tracking/FreeFileSync!30
Diffstat (limited to 'wx+/dc.h')
| -rw-r--r-- | wx+/dc.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -66,7 +66,7 @@ void drawFilledRectangle(wxDC& dc, wxRect rect, int borderWidth, const wxColor& macOS: wxWidgets uses DIP (note: wxScreenDC().GetPPI() returns 72 x 72 which is a lie; looks like 96 x 96) */ inline -int fastFromDIP(double d) //like wxWindow::FromDIP (but tied to primary monitor and buffered) +int fastFromDIP(int d) //like wxWindow::FromDIP (but tied to primary monitor and buffered) { #ifndef wxHAVE_DPI_INDEPENDENT_PIXELS #error why is wxHAVE_DPI_INDEPENDENT_PIXELS not defined? @@ -77,7 +77,7 @@ int fastFromDIP(double d) //like wxWindow::FromDIP (but tied to primary monitor //https://github.com/wxWidgets/wxWidgets/blob/d9d05c2bb201078f5e762c42458ca2f74af5b322/include/wx/window.h#L2060 return d; //e.g. macOS, GTK3 } - +int fastFromDIP(double d) = delete; |