projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Explicit casts optional to bool.
[dcpomatic.git]
/
src
/
wx
/
content_colour_conversion_dialog.cc
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 ();
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 {
if (preset) {
_preset_choice->SetSelection (preset.get ());
} else {
@@
-123,5
+123,3
@@
ContentColourConversionDialog::preset_choice_changed ()
set (presets[s].conversion);
}
}
set (presets[s].conversion);
}
}
-
-