#include <boost/function.hpp>
#include <vector>
-bool always_valid ();
-
/** @param T type of things being edited.
* @param S dialog to edit a thing.
*/
std::vector<std::string> columns,
boost::function<std::vector<T> ()> get,
boost::function<void (std::vector<T>)> set,
- boost::function<bool (T)> valid,
boost::function<std::string (T, int)> column,
bool can_edit = true,
bool title = true
: wxPanel (parent)
, _get (get)
, _set (set)
- , _valid (valid)
, _columns (columns.size ())
, _column (column)
, _edit (0)
{
- wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
- SetSizer (s);
-
- _table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
- _table->AddGrowableCol (0, 1);
- s->Add (_table, 1, wxEXPAND);
+ _sizer = new wxBoxSizer (wxHORIZONTAL);
+ SetSizer (_sizer);
long style = wxLC_REPORT | wxLC_SINGLE_SEL;
if (title) {
_list->InsertColumn (i, ip);
}
- _table->Add (_list, 1, wxEXPAND | wxALL);
+ _sizer->Add (_list, 1, wxEXPAND);
{
wxSizer* s = new wxBoxSizer (wxVERTICAL);
}
_remove = new wxButton (this, wxID_ANY, _("Remove"));
s->Add (_remove, 0, wxTOP | wxBOTTOM, 2);
- _table->Add (s, 0);
+ _sizer->Add (s, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
}
_add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::add_clicked, this));
void layout ()
{
- _table->Layout ();
+ _sizer->Layout ();
}
boost::signals2::signal<void ()> SelectionChanged;
S* dialog = new S (this);
if (dialog->ShowModal() == wxID_OK) {
- T const v = dialog->get ();
- if (_valid (v)) {
- add_to_control (v);
+ boost::optional<T> const v = dialog->get ();
+ if (v) {
+ add_to_control (v.get ());
std::vector<T> all = _get ();
- all.push_back (v);
+ all.push_back (v.get ());
_set (all);
}
}
S* dialog = new S (this);
dialog->set (all[item]);
if (dialog->ShowModal() == wxID_OK) {
- T const v = dialog->get ();
- if (!_valid (v)) {
+ boost::optional<T> const v = dialog->get ();
+ if (!v) {
return;
}
- all[item] = v;
+ all[item] = v.get ();
}
dialog->Destroy ();
boost::function <std::vector<T> ()> _get;
boost::function <void (std::vector<T>)> _set;
- boost::function <bool (T)> _valid;
int _columns;
boost::function<std::string (T, int)> _column;
wxButton* _edit;
wxButton* _remove;
wxListCtrl* _list;
- wxFlexGridSizer* _table;
+ wxBoxSizer* _sizer;
};
#endif