Explicit casts optional to bool.

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 5b02d71e358a4f0e016ce6be3ef8efec222381ea..dcafee4caff7ae207e499f3bdcac6b5899f4583d 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -227,7 +227,7 @@ private:
        {
                Config* config = Config::instance ();
 
-               checked_set (_set_language, config->language ());
+               checked_set (_set_language, static_cast<bool>(config->language()));
 
                if (config->language().get_value_or ("") == "fr") {
                        checked_set (_language, 3);

diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index 9713cde1b0f555713f17a7ee5a5c52bd1cd69069..e4e16157d3b648b67350a95bbeff0d582d145a05 100644 (file)
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -93,8 +93,8 @@ ContentColourConversionDialog::check_for_preset ()
 
        optional<size_t> preset = _editor->get().preset ();
 
-       _preset_check->SetValue (preset);
-       _preset_choice->Enable (preset);
+       _preset_check->SetValue (static_cast<bool>(preset));
+       _preset_choice->Enable (static_cast<bool>(preset));
        if (preset) {
                _preset_choice->SetSelection (preset.get ());
        } else {
@@ -123,5 +123,3 @@ ContentColourConversionDialog::preset_choice_changed ()
                set (presets[s].conversion);
        }
 }
-
-

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 66e37a4cf94d58225b199fa8a88cef93fe19de22..13dd9f42fbdba4cdc5d49f86a39637a60ac796b9 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -130,7 +130,7 @@ ScreenDialog::setup_sensitivity ()
 {
        wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this));
        if (ok) {
-               ok->Enable (_certificate);
+               ok->Enable (static_cast<bool>(_certificate));
        }
 
        _download_certificate->Enable (