Draw reels in the timeline.

[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 b382c342937f5d01ab77c43a527ab259958fcadd..e4e16157d3b648b67350a95bbeff0d582d145a05 100644 (file)
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -25,6 +25,7 @@
 #include "colour_conversion_editor.h"
 #include <wx/statline.h>
 #include <boost/foreach.hpp>
+#include <iostream>
 
 using std::string;
 using std::vector;
@@ -39,7 +40,7 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent)
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
        SetSizer (overall_sizer);
 
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+       wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_Y_GAP - 2, DCPOMATIC_SIZER_X_GAP);
        _preset_check = new wxCheckBox (this, wxID_ANY, _("Use preset"));
        table->Add (_preset_check, 0, wxALIGN_CENTER_VERTICAL);
        _preset_choice = new wxChoice (this, wxID_ANY);
@@ -89,11 +90,11 @@ ContentColourConversionDialog::check_for_preset ()
        if (_setting) {
                return;
        }
-       
+
        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 {
@@ -122,5 +123,3 @@ ContentColourConversionDialog::preset_choice_changed ()
                set (presets[s].conversion);
        }
 }
-
-