From a1fde23d885685958a94f329bce4834c7c7fbbf9 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Thu, 15 Jun 2017 10:26:31 -0700 Subject: [PATCH] Simplify conversion from bool there is no need to explicitly convert to int --- src/gtk/webview_webkit.cpp | 8 ++------ src/gtk/webview_webkit2.cpp | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp index 68f0b8d5d4..aa6cc1a2c9 100644 --- a/src/gtk/webview_webkit.cpp +++ b/src/gtk/webview_webkit.cpp @@ -394,10 +394,7 @@ wxgtk_webview_webkit_context_menu(WebKitWebView *, gboolean, wxWebViewWebKit *webKitCtrl) { - if(webKitCtrl->IsContextMenuEnabled()) - return FALSE; - else - return TRUE; + return !webKitCtrl->IsContextMenuEnabled(); } #endif @@ -796,8 +793,7 @@ void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom) void wxWebViewWebKit::SetZoomType(wxWebViewZoomType type) { webkit_web_view_set_full_content_zoom(m_web_view, - (type == wxWEBVIEW_ZOOM_TYPE_LAYOUT ? - TRUE : FALSE)); + type == wxWEBVIEW_ZOOM_TYPE_LAYOUT); } wxWebViewZoomType wxWebViewWebKit::GetZoomType() const diff --git a/src/gtk/webview_webkit2.cpp b/src/gtk/webview_webkit2.cpp index e2b0c3047a..477ae14163 100644 --- a/src/gtk/webview_webkit2.cpp +++ b/src/gtk/webview_webkit2.cpp @@ -369,10 +369,7 @@ wxgtk_webview_webkit_context_menu(WebKitWebView *, WebKitHitTestResult *, wxWebViewWebKit *webKitCtrl) { - if(webKitCtrl->IsContextMenuEnabled()) - return FALSE; - else - return TRUE; + return !webKitCtrl->IsContextMenuEnabled(); } static WebKitWebView* @@ -905,8 +902,7 @@ void wxWebViewWebKit::SetZoomType(wxWebViewZoomType type) { WebKitSettings* settings = webkit_web_view_get_settings(m_web_view); webkit_settings_set_zoom_text_only(settings, - (type == wxWEBVIEW_ZOOM_TYPE_TEXT ? - TRUE : FALSE)); + type == wxWEBVIEW_ZOOM_TYPE_TEXT); } wxWebViewZoomType wxWebViewWebKit::GetZoomType() const