X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftext_panel.cc;h=ebeb518ddb2e1f2d15e2e9483aad74fcab2aae39;hb=65bd479a3008fb269925e1ce92e547c863ede73d;hp=a3e8a2c63be44fe039f58242fc6b9bb0e74a6b1b;hpb=dd7996d3c27f167d4f80bd8862f39781507589d7;p=dcpomatic.git

diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index a3e8a2c63..ebeb518dd 100644
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -82,30 +82,24 @@ TextPanel::TextPanel (ContentPanel* p, TextType t)
 
 	_burn = new CheckBox (this, _("Burn subtitles into image"));
 
-#ifdef __WXGTK3__
-	int const spin_width = 118;
-#else
-	int const spin_width = 56;
-#endif
-
 	_offset_label = create_label (this, _("Offset"), true);
 	_x_offset_label = create_label (this, _("X"), true);
-	_x_offset = new SpinCtrl (this, spin_width);
+	_x_offset = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH);
 	_x_offset_pc_label = new StaticText (this, _("%"));
 	_y_offset_label = create_label (this, _("Y"), true);
-	_y_offset = new SpinCtrl (this, spin_width);
+	_y_offset = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH);
 	_y_offset_pc_label = new StaticText (this, _("%"));
 
 	_scale_label = create_label (this, _("Scale"), true);
 	_x_scale_label = create_label (this, _("X"), true);
-	_x_scale = new SpinCtrl (this, spin_width);
+	_x_scale = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH);
 	_x_scale_pc_label = new StaticText (this, _("%"));
 	_y_scale_label = create_label (this, S_("Coord|Y"), true);
-	_y_scale = new SpinCtrl (this, spin_width);
+	_y_scale = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH);
 	_y_scale_pc_label = new StaticText (this, _("%"));
 
 	_line_spacing_label = create_label (this, _("Line spacing"), true);
-	_line_spacing = new SpinCtrl (this, spin_width);
+	_line_spacing = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH);
 	_line_spacing_pc_label = new StaticText (this, _("%"));
 
 	_stream_label = create_label (this, _("Stream"), true);
@@ -288,9 +282,9 @@ TextPanel::add_to_grid ()
 	{
 		auto s = new wxBoxSizer (wxHORIZONTAL);
 
-		s->Add (_text_view_button, 1, wxALL, DCPOMATIC_SIZER_GAP);
-		s->Add (_fonts_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP);
-		s->Add (_appearance_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP);
+		s->Add (_text_view_button, 0, wxALL, DCPOMATIC_SIZER_GAP);
+		s->Add (_fonts_dialog_button, 0, wxALL, DCPOMATIC_SIZER_GAP);
+		s->Add (_appearance_dialog_button, 0, wxALL, DCPOMATIC_SIZER_GAP);
 
 		_grid->Add (s, wxGBPosition(r, 0), wxGBSpan(1, 2));
 		++r;
@@ -343,7 +337,7 @@ TextPanel::update_dcp_tracks ()
 		/* XXX: don't display the "magic" track which has empty name and language;
 		   this is a nasty hack (see also Film::closed_caption_tracks)
 		*/
-		if (!i.name.empty() || !i.language.empty()) {
+		if (!i.name.empty() || i.language) {
 			_dcp_track->Append (std_to_wx(i.summary()));
 		}
 	}