summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TO_PORT1
-rw-r--r--src/wx/dcp_panel.cc2
2 files changed, 1 insertions, 2 deletions
diff --git a/TO_PORT b/TO_PORT
index 08e95e584..2e7d3a6b4 100644
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,3 +1,2 @@
-a3d9e62ff8e1068312a52460ca193abf87f6a6ad
e0b8987596d7b5bb032900305e8ef522e795e8d8
4806d9f4864e2cb7f41b2cc430bbaa869248cf35
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 0c7cb668d..b56a783bb 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -547,7 +547,7 @@ DCPPanel::make_video_panel ()
_frame_rate_sizer->Add (_frame_rate_spin, 1, wxALIGN_CENTER_VERTICAL);
setup_frame_rate_widget ();
_best_frame_rate = new wxButton (panel, wxID_ANY, _("Use best"));
- _frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND);
+ _frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL);
grid->Add (_frame_rate_sizer, wxGBPosition (r, 1));
}
++r;