Update for TableDialog constructor change.

diff --git a/src/wx/audio_gain_dialog.cc b/src/wx/audio_gain_dialog.cc
index 75a993d8c4df4b0a4006e24cc43de2f4de129b23..fddf671485be95cb5433efb6e5c878f1e234fafa 100644 (file)
--- a/src/wx/audio_gain_dialog.cc
+++ b/src/wx/audio_gain_dialog.cc
@@ -23,7 +23,7 @@
 #include "wx_util.h"
 
 AudioGainDialog::AudioGainDialog (wxWindow* parent, int c, int d, float v)
-       : TableDialog (parent, _("Channel gain"), 3, true)
+       : TableDialog (parent, _("Channel gain"), 3, 1, true)
 {
        add (wxString::Format (_("Gain for content channel %d in DCP channel %d"), c + 1, d + 1), false);
        _gain = add (new wxSpinCtrlDouble (this));

diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc
index 782481d54f6e332c299fdb908750d7769cc16911..a54dd733577b00b4e45a0bb62e4b5ac2de7eef27 100644 (file)
--- a/src/wx/cinema_dialog.cc
+++ b/src/wx/cinema_dialog.cc
@@ -23,7 +23,7 @@
 using std::string;
 
 CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, string email)
-       : TableDialog (parent, std_to_wx (title), 2, true)
+       : TableDialog (parent, std_to_wx (title), 2, 1, true)
 {
        add (_("Name"), true);
        _name = add (new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (256, -1)));

diff --git a/src/wx/content_properties_dialog.cc b/src/wx/content_properties_dialog.cc
index 4f92e53ce05aa925058bfbc88e62956e7869a196..0b9bd0bb85b8b88f36a18700384f0a8be74fe816 100644 (file)
--- a/src/wx/content_properties_dialog.cc
+++ b/src/wx/content_properties_dialog.cc
@@ -33,7 +33,7 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
 ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<Content> content)
-       : TableDialog (parent, _("Content Properties"), 2, false)
+       : TableDialog (parent, _("Content Properties"), 2, 1, false)
 {
        string n = content->path(0).string();
        boost::algorithm::replace_all (n, "&", "&&");

diff --git a/src/wx/download_certificate_dialog.cc b/src/wx/download_certificate_dialog.cc
index 90d383298e6a77ff696e00d890e2269556f8ec46..275c943db7687895430f02897026e8aa15aef4ce 100644 (file)
--- a/src/wx/download_certificate_dialog.cc
+++ b/src/wx/download_certificate_dialog.cc
@@ -24,7 +24,7 @@
 using boost::function;
 
 DownloadCertificateDialog::DownloadCertificateDialog (wxWindow* parent, function<void (boost::filesystem::path)> load)
-       : TableDialog (parent, _("Download certificate"), 2, true)
+       : TableDialog (parent, _("Download certificate"), 2, 1, true)
        , _load (load)
        , _message (0)
        , _download (0)
@@ -61,5 +61,3 @@ DownloadCertificateDialog::downloaded (bool done)
        wxButton* ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
        ok->Enable (done);
 }
-
-

diff --git a/src/wx/gain_calculator_dialog.cc b/src/wx/gain_calculator_dialog.cc
index 133d84c21719cfa30b0718898636987f3f43a5ce..a840aebef4ad7a64f94691f3ed6461fe7bc45f1d 100644 (file)
--- a/src/wx/gain_calculator_dialog.cc
+++ b/src/wx/gain_calculator_dialog.cc
@@ -24,7 +24,7 @@
 using namespace boost;
 
 GainCalculatorDialog::GainCalculatorDialog (wxWindow* parent)
-       : TableDialog (parent, _("Gain Calculator"), 2, true)
+       : TableDialog (parent, _("Gain Calculator"), 2, 1, true)
 {
        add (_("I want to play this back at fader"), true);
        _wanted = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC)));

diff --git a/src/wx/image_sequence_dialog.cc b/src/wx/image_sequence_dialog.cc
index 12d12182f97ec37e79ee00102f12c8bacb9c0080..0cdf653a57a081c1e63fc250a884b3b56def665c 100644 (file)
--- a/src/wx/image_sequence_dialog.cc
+++ b/src/wx/image_sequence_dialog.cc
@@ -22,7 +22,7 @@
 #include "lib/raw_convert.h"
 
 ImageSequenceDialog::ImageSequenceDialog (wxWindow* parent)
-       : TableDialog (parent, _("Add image sequence"), 2, true)
+       : TableDialog (parent, _("Add image sequence"), 2, 1, true)
 {
        add (_("Frame rate"), true);
        _frame_rate = add (new wxTextCtrl (this, wxID_ANY, N_("24")));

diff --git a/src/wx/isdcf_metadata_dialog.cc b/src/wx/isdcf_metadata_dialog.cc
index a25a2b8dfdab523eb71a9d1240cad19d13bc0d12..aac452355fc676042491f365846abe8f6447bed4 100644 (file)
--- a/src/wx/isdcf_metadata_dialog.cc
+++ b/src/wx/isdcf_metadata_dialog.cc
@@ -28,7 +28,7 @@ using boost::shared_ptr;
 
 /** @param threed true if the film is in 3D */
 ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm, bool threed)
-       : TableDialog (parent, _("ISDCF name"), 2, true)
+       : TableDialog (parent, _("ISDCF name"), 2, 1, true)
 {
        add (_("Content version"), true);
        _content_version = add (new wxSpinCtrl (this, wxID_ANY));

diff --git a/src/wx/key_dialog.cc b/src/wx/key_dialog.cc
index d8005a600bdaaf1e320dfec32969814afdac40a0..2062a2341aa060f75aa4fac62b029b880b4ae487 100644 (file)
--- a/src/wx/key_dialog.cc
+++ b/src/wx/key_dialog.cc
@@ -24,7 +24,7 @@
 using std::cout;
 
 KeyDialog::KeyDialog (wxWindow* parent, dcp::Key key)
-       : TableDialog (parent, _("Key"), 3, true)
+       : TableDialog (parent, _("Key"), 3, 1, true)
 {
        add (_("Key"), true);
 

diff --git a/src/wx/make_chain_dialog.cc b/src/wx/make_chain_dialog.cc
index be9908ab9dc1bb7521ec806d6b8b51e6c0256f13..17af4855457447e182aab2ec675d60681fc1000a 100644 (file)
--- a/src/wx/make_chain_dialog.cc
+++ b/src/wx/make_chain_dialog.cc
@@ -30,7 +30,7 @@ MakeChainDialog::MakeChainDialog (
        string intermediate_common_name,
        string leaf_common_name
        )
-       : TableDialog (parent, _("Make certificate chain"), 2, true)
+       : TableDialog (parent, _("Make certificate chain"), 2, 1, true)
 {
        wxTextValidator validator (wxFILTER_EXCLUDE_CHAR_LIST);
        validator.SetCharExcludes (wxT ("/"));

diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index eae14df74538e122fdc6957defbd634d1b28a9b5..99cd735f4b9805ce4cbe2e745e72c2466c684072 100644 (file)
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -32,7 +32,7 @@ using namespace boost;
 boost::optional<boost::filesystem::path> NewFilmDialog::_directory;
 
 NewFilmDialog::NewFilmDialog (wxWindow* parent)
-       : TableDialog (parent, _("New Film"), 2, true)
+       : TableDialog (parent, _("New Film"), 2, 1, true)
 {
        add (_("Film name"), true);
        _name = add (new wxTextCtrl (this, wxID_ANY));

diff --git a/src/wx/repeat_dialog.cc b/src/wx/repeat_dialog.cc
index 574dcd1c0cdab38a4967ee48ca51dd5d96e6ef36..aeaf0420ef16e574a0ace95344f7adfed443a925 100644 (file)
--- a/src/wx/repeat_dialog.cc
+++ b/src/wx/repeat_dialog.cc
@@ -21,7 +21,7 @@
 #include "wx_util.h"
 
 RepeatDialog::RepeatDialog (wxWindow* parent)
-       : TableDialog (parent, _("Repeat Content"), 3, true)
+       : TableDialog (parent, _("Repeat Content"), 3, 1, true)
 {
        add (_("Repeat"), true);
        _number = add (new wxSpinCtrl (this, wxID_ANY));

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index da813e32a99e5a49dc70228c3939d78c83aee548..e312af9205b1dc24ebf940b14e520d957c847463 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -33,7 +33,7 @@ using std::cout;
 using boost::optional;
 
 ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optional<dcp::Certificate> certificate)
-       : TableDialog (parent, std_to_wx (title), 2, true)
+       : TableDialog (parent, std_to_wx (title), 2, 1, true)
        , _certificate (certificate)
 {
        add (_("Name"), true);

diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index 37f68da295e6fc9715c169366698a87ad8aa2b86..8b32ad3b9ca55417850d8627387db42d6419b060 100644 (file)
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -25,7 +25,7 @@ using std::string;
 using boost::shared_ptr;
 
 ServerDialog::ServerDialog (wxWindow* parent)
-       : TableDialog (parent, _("Server"), 2, true)
+       : TableDialog (parent, _("Server"), 2, 1, true)
 {
         wxClientDC dc (parent);
        /* XXX: bit of a mystery why we need such a long string here */
@@ -52,4 +52,3 @@ ServerDialog::get () const
 {
        return wx_to_std (_host->GetValue ());
 }
-