Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid -Wdouble-promotion warnings

Browse Source
This commit is contained in:
Paul Cornett
2020-10-14 11:07:55 -07:00
parent 97655e5b21
commit b5a554b9a6
44 changed files with 208 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk/webview_webkit2.cpp
View File

@@ -626,17 +626,17 @@ wxWebViewWebKit::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
void wxWebViewWebKit::ZoomIn()
{
SetWebkitZoom(GetWebkitZoom() + 0.1);
SetWebkitZoom(GetWebkitZoom() + 0.1f);
}
void wxWebViewWebKit::ZoomOut()
{
SetWebkitZoom(GetWebkitZoom() - 0.1);
SetWebkitZoom(GetWebkitZoom() - 0.1f);
}
void wxWebViewWebKit::SetWebkitZoom(float level)
{
webkit_web_view_set_zoom_level(m_web_view, level);
webkit_web_view_set_zoom_level(m_web_view, double(level));
}
float wxWebViewWebKit::GetWebkitZoom() const
@@ -904,19 +904,19 @@ wxWebViewZoom wxWebViewWebKit::GetZoom() const
float zoom = GetWebkitZoom();
// arbitrary way to map float zoom to our common zoom enum
if (zoom <= 0.65)
if (zoom <= 0.65f)
{
return wxWEBVIEW_ZOOM_TINY;
}
if (zoom <= 0.90)
if (zoom <= 0.90f)
{
return wxWEBVIEW_ZOOM_SMALL;
}
if (zoom <= 1.15)
if (zoom <= 1.15f)
{
return wxWEBVIEW_ZOOM_MEDIUM;
}
if (zoom <= 1.45)
if (zoom <= 1.45f)
{
return wxWEBVIEW_ZOOM_LARGE;
}