Remove some unnecessary wxPanels.

3 files changed, 30 insertions, 46 deletions

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index b6929a033..45a7d8f9d 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -335,23 +335,20 @@ class App : public wxApp
 		frame->Connect (ID_jobs_make_dcp_from_existing_transcode, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_make_dcp_from_existing_transcode));
 		frame->Connect (ID_help_about, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::help_about));
 
-		wxPanel* rhs = new wxPanel (frame);
-		
 		film_editor = new FilmEditor (film, frame);
-		film_viewer = new FilmViewer (film, rhs);
+		film_viewer = new FilmViewer (film, frame);
 #ifndef DVDOMATIC_DISABLE_PLAYER
 		film_player = new FilmPlayer (film, frame);
 #endif
-		JobManagerView* job_manager_view = new JobManagerView (rhs);
+		JobManagerView* job_manager_view = new JobManagerView (frame);
 
 		wxSizer* rhs_sizer = new wxBoxSizer (wxVERTICAL);
 		rhs_sizer->Add (film_viewer, 3, wxEXPAND | wxALL);
 		rhs_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL);
-		rhs->SetSizer (rhs_sizer);
 
 		wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL);
 		main_sizer->Add (film_editor, 0, wxALL, 6);
-		main_sizer->Add (rhs, 1, wxEXPAND | wxALL, 6);
+		main_sizer->Add (rhs_sizer, 1, wxEXPAND | wxALL, 6);
 		frame->SetSizer (main_sizer);
 
 		SetTopWindow (frame);
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 089903fba..34282895d 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -92,13 +92,12 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 
 	{
 		add_label_to_sizer (table, this, "Reference filters for A/B");
-		wxPanel* p = new wxPanel (this);
 		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_reference_filters = new wxStaticText (p, wxID_ANY, wxT (""));
+		_reference_filters = new wxStaticText (this, wxID_ANY, wxT (""));
 		s->Add (_reference_filters, 1, wxEXPAND);
-		_reference_filters_button = new wxButton (p, wxID_ANY, _("Edit..."));
+		_reference_filters_button = new wxButton (this, wxID_ANY, _("Edit..."));
 		s->Add (_reference_filters_button, 0);
-		table->Add (p, 1, wxEXPAND);
+		table->Add (s, 1, wxEXPAND);
 		table->AddSpacer (0);
 	}
 
@@ -116,14 +115,12 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 	table->Add (_servers, 1, wxEXPAND);
 
 	{
-		wxPanel* p = new wxPanel (this);
 		wxSizer* s = new wxBoxSizer (wxVERTICAL);
-		p->SetSizer (s);
-		_add_server = new wxButton (p, wxID_ANY, _("Add"));
+		_add_server = new wxButton (this, wxID_ANY, _("Add"));
 		s->Add (_add_server);
-		_remove_server = new wxButton (p, wxID_ANY, _("Remove"));
+		_remove_server = new wxButton (this, wxID_ANY, _("Remove"));
 		s->Add (_remove_server);
-		table->Add (p, 0);
+		table->Add (s, 0);
 	}
 		
 	Config* config = Config::instance ();
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index abbb8fa22..3b2571238 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -77,36 +77,32 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent)
 	{
 		add_label_to_sizer (sizer, this, "Crop");
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		wxPanel* p = new wxPanel (this);
-		p->SetSizer (s);
 
-		add_label_to_sizer (s, p, "L");
-		_left_crop = new wxSpinCtrl (p, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+		add_label_to_sizer (s, this, "L");
+		_left_crop = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
 		s->Add (_left_crop, 0);
-		add_label_to_sizer (s, p, "R");
-		_right_crop = new wxSpinCtrl (p, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+		add_label_to_sizer (s, this, "R");
+		_right_crop = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
 		s->Add (_right_crop, 0);
-		add_label_to_sizer (s, p, "T");
-		_top_crop = new wxSpinCtrl (p, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+		add_label_to_sizer (s, this, "T");
+		_top_crop = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
 		s->Add (_top_crop, 0);
-		add_label_to_sizer (s, p, "B");
-		_bottom_crop = new wxSpinCtrl (p, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+		add_label_to_sizer (s, this, "B");
+		_bottom_crop = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
 		s->Add (_bottom_crop, 0);
 
-		sizer->Add (p);
+		sizer->Add (s);
 	}
 
 	/* VIDEO-only stuff */
 	{
 		video_control (add_label_to_sizer (sizer, this, "Filters"));
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		wxPanel* p = new wxPanel (this);
-		p->SetSizer (s);
-		_filters = new wxStaticText (p, wxID_ANY, wxT (""));
+		_filters = new wxStaticText (this, wxID_ANY, wxT (""));
 		s->Add (_filters, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
-		_filters_button = new wxButton (p, wxID_ANY, wxT ("Edit..."));
+		_filters_button = new wxButton (this, wxID_ANY, wxT ("Edit..."));
 		s->Add (_filters_button, 0);
-		sizer->Add (p, 1);
+		sizer->Add (s, 1);
 	}
 
 	video_control (add_label_to_sizer (sizer, this, "Scaler"));
@@ -116,23 +112,19 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent)
 	{
 		video_control (add_label_to_sizer (sizer, this, "Audio Gain"));
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		wxPanel* p = new wxPanel (this);
-		p->SetSizer (s);
-		_audio_gain = new wxSpinCtrl (p);
+		_audio_gain = new wxSpinCtrl (this);
 		s->Add (video_control (_audio_gain), 1);
-		video_control (add_label_to_sizer (s, p, "dB"));
-		sizer->Add (p);
+		video_control (add_label_to_sizer (s, this, "dB"));
+		sizer->Add (s);
 	}
 
 	{
 		video_control (add_label_to_sizer (sizer, this, "Audio Delay"));
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		wxPanel* p = new wxPanel (this);
-		p->SetSizer (s);
-		_audio_delay = new wxSpinCtrl (p);
+		_audio_delay = new wxSpinCtrl (this);
 		s->Add (video_control (_audio_delay), 1);
-		video_control (add_label_to_sizer (s, p, "ms"));
-		sizer->Add (p);
+		video_control (add_label_to_sizer (s, this, "ms"));
+		sizer->Add (s);
 	}
 
 	video_control (add_label_to_sizer (sizer, this, "Original Size"));
@@ -150,13 +142,11 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent)
 	{
 		video_control (add_label_to_sizer (sizer, this, "Range"));
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		wxPanel* p = new wxPanel (this);
-		p->SetSizer (s);
-		_dcp_range = new wxStaticText (p, wxID_ANY, wxT (""));
+		_dcp_range = new wxStaticText (this, wxID_ANY, wxT (""));
 		s->Add (video_control (_dcp_range), 1, wxALIGN_CENTER_VERTICAL);
-		_change_dcp_range_button = new wxButton (p, wxID_ANY, wxT ("Edit..."));
+		_change_dcp_range_button = new wxButton (this, wxID_ANY, wxT ("Edit..."));
 		s->Add (video_control (_change_dcp_range_button));
-		sizer->Add (p);
+		sizer->Add (s);
 	}
 
 	_dcp_ab = new wxCheckBox (this, wxID_ANY, wxT ("A/B"));