Include tidying.

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

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 67e1a99515527b3b3dc7a0d6dcaf4942d2b0328e..7046c160e58b4f1513d694119db27175cdb948c9 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -17,24 +17,25 @@
 
 */
 
-#include <wx/treectrl.h>
-#include <wx/datectrl.h>
-#include <wx/timectrl.h>
-#include <wx/stdpaths.h>
-#include <wx/listctrl.h>
-#include <libcxml/cxml.h>
-#include "lib/cinema.h"
-#include "lib/config.h"
-#include "lib/film.h"
 #include "kdm_dialog.h"
 #include "cinema_dialog.h"
 #include "screen_dialog.h"
 #include "wx_util.h"
+#include "lib/cinema.h"
+#include "lib/config.h"
+#include "lib/film.h"
+#include "lib/screen.h"
+#include <libcxml/cxml.h>
 #ifdef DCPOMATIC_USE_OWN_DIR_PICKER
 #include "dir_picker_ctrl.h"
 #else
 #include <wx/filepicker.h>
 #endif
+#include <wx/treectrl.h>
+#include <wx/datectrl.h>
+#include <wx/timectrl.h>
+#include <wx/stdpaths.h>
+#include <wx/listctrl.h>
 
 using std::string;
 using std::map;
@@ -62,7 +63,7 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr<const Film> film)
        vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL);
 
        wxBoxSizer* targets = new wxBoxSizer (wxHORIZONTAL);
-       _targets = new wxTreeCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HIDE_ROOT | wxTR_MULTIPLE | wxTR_HAS_BUTTONS);
+       _targets = new wxTreeCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HIDE_ROOT | wxTR_MULTIPLE | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT);
        targets->Add (_targets, 1, wxEXPAND | wxTOP | wxRIGHT, DCPOMATIC_SIZER_GAP);
 
        _root = _targets->AddRoot ("Foo");
@@ -195,7 +196,7 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr<const Film> film)
 
        wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
        if (buttons) {
-               overall_sizer->Add (buttons, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_Y_GAP);
+               overall_sizer->Add (buttons, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
        }
 
        _write_to->SetValue (true);
@@ -305,6 +306,7 @@ KDMDialog::add_screen (shared_ptr<Cinema> c, shared_ptr<Screen> s)
        }
 
        _screens[_targets->AppendItem (i->first, std_to_wx (s->name))] = s;
+       _targets->Expand (i->first);
 }
 
 void