X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=eba81507c7526b8af79bebf4dd92115c270cc318;hb=bfcfda264d12e42facce6f59e7cada9574ca7f2e;hp=dcfcf394b08c6a67b289259c13d1ecda81f34a3f;hpb=6e3e984162ca7a181bc7c98d90c295e88e4e7f6c;p=dcpomatic.git

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index dcfcf394b..eba81507c 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -844,9 +844,9 @@ public:
 private:
 	void setup ()
 	{
-		wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+		auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 		table->AddGrowableCol (1, 1);
-		_panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
+		_panel->GetSizer()->Add (table, 0, wxEXPAND | wxALL, _border);
 
 		add_label_to_sizer (table, _panel, _("Subject"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_subject = new wxTextCtrl (_panel, wxID_ANY);
@@ -968,7 +968,7 @@ private:
 	{
 		auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 		table->AddGrowableCol (1, 1);
-		_panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
+		_panel->GetSizer()->Add (table, 0, wxEXPAND | wxALL, _border);
 
 		_enable_message_box = new CheckBox (_panel, _("Message box"));
 		table->Add (_enable_message_box, 1, wxEXPAND | wxALL);
@@ -1425,7 +1425,7 @@ private:
 
 		{
 			add_top_aligned_label_to_sizer (table, _panel, _("Log"));
-			auto t = new wxBoxSizer (wxVERTICAL);
+			auto t = new wxFlexGridSizer (2);
 			_log_general = new CheckBox (_panel, _("General"));
 			t->Add (_log_general, 1, wxEXPAND | wxALL);
 			_log_warning = new CheckBox (_panel, _("Warnings"));
@@ -1459,7 +1459,9 @@ private:
 		_maximum_j2k_bandwidth->SetRange (1, 1000);
 		_maximum_j2k_bandwidth->Bind (wxEVT_SPINCTRL, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this));
 		_video_display_mode->Append (_("Simple (safer)"));
+#if wxCHECK_VERSION(3, 1, 0)
 		_video_display_mode->Append (_("OpenGL (faster)"));
+#endif
 		_video_display_mode->Bind (wxEVT_CHOICE, boost::bind(&AdvancedPage::video_display_mode_changed, this));
 		_allow_any_dcp_frame_rate->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this));
 		_allow_any_container->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_container_changed, this));
@@ -1643,7 +1645,7 @@ create_full_config_dialog ()
 	   the containing window doesn't shrink too much when we select those panels.
 	   This is obviously an unpleasant hack.
 	*/
-	wxSize ps = wxSize (700, -1);
+	wxSize ps = wxSize (750, -1);
 	int const border = 16;
 #else
 	wxSize ps = wxSize (-1, -1);