projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename _size -> _video_size
[dcpomatic.git]
/
src
/
wx
/
server_dialog.cc
diff --git
a/src/wx/server_dialog.cc
b/src/wx/server_dialog.cc
index 18ed09e9e1ad48bf3f728965bde572e183d6903c..5761222c64eec703decaf228c3dfb760e11b39b4 100644
(file)
--- a/
src/wx/server_dialog.cc
+++ b/
src/wx/server_dialog.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-22,7
+23,8
@@
#include "wx_util.h"
using std::string;
#include "wx_util.h"
using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+using boost::optional;
ServerDialog::ServerDialog (wxWindow* parent)
: TableDialog (parent, _("Server"), 2, 1, true)
ServerDialog::ServerDialog (wxWindow* parent)
: TableDialog (parent, _("Server"), 2, 1, true)
@@
-39,6
+41,8
@@
ServerDialog::ServerDialog (wxWindow* parent)
_host = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size));
layout ();
_host = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size));
layout ();
+
+ _host->SetFocus ();
}
void
}
void
@@
-47,7
+51,7
@@
ServerDialog::set (string server)
_host->SetValue (std_to_wx (server));
}
_host->SetValue (std_to_wx (server));
}
-string
+optional<string>
ServerDialog::get () const
{
return wx_to_std (_host->GetValue ());
ServerDialog::get () const
{
return wx_to_std (_host->GetValue ());