Merge master.

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

diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index 46e3f7127acb77eaebf82da981c8b788d883a3e5..33cb392bfe52886f2878ebfd33ad001022483f58 100644 (file)
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -27,17 +27,17 @@ ServerDialog::ServerDialog (wxWindow* parent, ServerDescription* server)
        if (server) {
                _server = server;
        } else {
-               _server = new ServerDescription (N_("localhost"), 1);
+               _server = new ServerDescription (wx_to_std (N_("localhost")), 1);
        }
                
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, 4, 4);
+       wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
        table->AddGrowableCol (1, 1);
 
-       add_label_to_sizer (table, this, _("Host name or IP address"));
+       add_label_to_sizer (table, this, _("Host name or IP address"), true);
        _host = new wxTextCtrl (this, wxID_ANY);
        table->Add (_host, 1, wxEXPAND);
 
-       add_label_to_sizer (table, this, _("Threads to use"));
+       add_label_to_sizer (table, this, _("Threads to use"), true);
        _threads = new wxSpinCtrl (this, wxID_ANY);
        table->Add (_threads, 1, wxEXPAND);