- wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
-
- add_label_to_sizer (table, this, _("KDM type"), true);
-
- wxBoxSizer* type = new wxBoxSizer (wxHORIZONTAL);
- _type = new wxChoice (this, wxID_ANY);
- _type->Append ("Modified Transitional 1", ((void *) dcp::MODIFIED_TRANSITIONAL_1));
- _type->Append ("Multiple Modified Transitional 1", ((void *) dcp::MULTIPLE_MODIFIED_TRANSITIONAL_1));
- _type->Append ("Modified Transitional 1 (without AuthorizedDeviceInfo)", ((void *) dcp::MODIFIED_TRANSITIONAL_TEST));
- if (!interop) {
- _type->Append ("DCI Any", ((void *) dcp::DCI_ANY));
- _type->Append ("DCI Specific", ((void *) dcp::DCI_SPECIFIC));
- }
- type->Add (_type, 1, wxEXPAND);
- _type->SetSelection (0);
- wxButton* advanced = new wxButton (this, wxID_ANY, _("Advanced..."));
- type->Add (advanced, 0, wxALIGN_CENTER_VERTICAL);
- table->Add (type, 1, wxEXPAND);
+ auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
+ table->AddGrowableCol (1);
+
+ add_label_to_sizer (table, this, _("KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+
+ auto type = new wxBoxSizer (wxHORIZONTAL);
+ _type = new KDMChoice (this);
+ type->Add (_type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD);
+ _type->set(Config::instance()->default_kdm_type());
+ auto advanced = new Button (this, _("Advanced..."));
+ type->Add (advanced, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+ table->Add (type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD);