Fix assorted GTK3-related alignment problems.

[dcpomatic.git] / src / wx / kdm_output_panel.cc

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index a345d0e963b62ed37dc6acde857f80998f11bd87..294fdd4dfb7f803ea12974bd8fba934a517f9f87 100644 (file)
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -18,9 +18,6 @@
 
 */
 
-#include "lib/config.h"
-#include "lib/cinema.h"
-#include "lib/send_kdm_email_job.h"
 #include "kdm_output_panel.h"
 #include "kdm_timing_panel.h"
 #include "confirm_kdm_email_dialog.h"
@@ -29,14 +26,22 @@
 #include "name_format_editor.h"
 #include "check_box.h"
 #include "dcpomatic_button.h"
+#include "lib/config.h"
+#include "lib/cinema.h"
+#include "lib/send_kdm_email_job.h"
+#include "lib/warnings.h"
 #include <dcp/exceptions.h>
 #include <dcp/types.h>
 #ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #else
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #endif
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/stdpaths.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 using std::pair;
 using std::string;
@@ -55,7 +60,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
        wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
        table->AddGrowableCol (1);
 
-       add_label_to_sizer (table, this, _("KDM type"), true);
+       add_label_to_sizer (table, this, _("KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 
        wxBoxSizer* type = new wxBoxSizer (wxHORIZONTAL);
        _type = new wxChoice (this, wxID_ANY);
@@ -112,11 +117,11 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 
        wxSizer* write_options = new wxBoxSizer(wxVERTICAL);
        _write_flat = new wxRadioButton (this, wxID_ANY, _("Write all KDMs to the same folder"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
-       write_options->Add (_write_flat);
+       write_options->Add (_write_flat, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
        _write_folder = new wxRadioButton (this, wxID_ANY, _("Write a folder for each cinema's KDMs"));
-       write_options->Add (_write_folder);
+       write_options->Add (_write_folder, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
        _write_zip = new wxRadioButton (this, wxID_ANY, _("Write a ZIP file for each cinema's KDMs"));
-       write_options->Add (_write_zip);
+       write_options->Add (_write_zip, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
        table->AddSpacer (0);
        table->Add (write_options);