Fix some disambiguation errors in i18n.

[dcpomatic.git] / src / wx / table_dialog.cc

diff --git a/src/wx/table_dialog.cc b/src/wx/table_dialog.cc
index b3937fd1868212b2a19c965076824c25b9388e6a..f19565e32fc70ae61f415699c472111bd410d4fe 100644 (file)
--- a/src/wx/table_dialog.cc
+++ b/src/wx/table_dialog.cc
@@ -20,14 +20,14 @@
 #include "table_dialog.h"
 #include "wx_util.h"
 
-TableDialog::TableDialog (wxWindow* parent, wxString title, int columns, bool cancel)
+TableDialog::TableDialog (wxWindow* parent, wxString title, int columns, int growable, bool cancel)
        : wxDialog (parent, wxID_ANY, title)
 {
        _overall_sizer = new wxBoxSizer (wxVERTICAL);
        SetSizer (_overall_sizer);
 
        _table = new wxFlexGridSizer (columns, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-       _table->AddGrowableCol (1, 1);
+       _table->AddGrowableCol (growable, 1);
 
        _overall_sizer->Add (_table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
@@ -50,9 +50,22 @@ TableDialog::layout ()
 }
 
 void
+#ifdef DCPOMATIC_OSX
 TableDialog::add (wxString text, bool label)
+#else
+TableDialog::add (wxString text, bool)
+#endif
 {
-       add_label_to_sizer (_table, this, text, label);
+       int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;
+#ifdef DCPOMATIC_OSX
+       if (label) {
+               flags |= wxALIGN_RIGHT;
+               text += wxT (":");
+       }
+#endif
+       wxStaticText* m = new wxStaticText (this, wxID_ANY, wxT (""));
+       m->SetLabelMarkup (text);
+       _table->Add (m, 0, flags, 6);
 }
 
 void