No-op: remove all trailing whitespace.

[dcpomatic.git] / src / wx / editable_list.h

diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index 481a147415e854aa4e6e2d03d77c8a604ef96702..be79f67e66597dd2e437ab16c51b55c50017dd1a 100644 (file)
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -70,11 +70,6 @@ public:
                        table->Add (s, 0);
                }
 
-               std::vector<T> current = _get ();
-               for (typename std::vector<T>::iterator i = current.begin (); i != current.end(); ++i) {
-                       add_to_control (*i);
-               }
-
                _add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::add_clicked, this));
                _copy->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::copy_clicked, this));
                _edit->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::edit_clicked, this));
@@ -87,7 +82,17 @@ public:
 
        }
 
-private:       
+       void refresh ()
+       {
+               _list->DeleteAllItems ();
+
+               std::vector<T> current = _get ();
+               for (typename std::vector<T>::iterator i = current.begin (); i != current.end(); ++i) {
+                       add_to_control (*i);
+               }
+       }
+
+private:
 
        void add_to_control (T item)
        {
@@ -116,11 +121,11 @@ private:
                dialog->ShowModal ();
 
                add_to_control (dialog->get ());
-               
+
                std::vector<T> all = _get ();
                all.push_back (dialog->get ());
                _set (all);
-               
+
                dialog->Destroy ();
        }
 
@@ -132,11 +137,11 @@ private:
                }
 
                std::vector<T> all = _get ();
-               assert (item >= 0 && item < int (all.size ()));
+               DCPOMATIC_ASSERT (item >= 0 && item < int (all.size ()));
 
                T copy (all[item]);
                add_to_control (copy);
-               
+
                all.push_back (copy);
                _set (all);
        }
@@ -149,14 +154,14 @@ private:
                }
 
                std::vector<T> all = _get ();
-               assert (item >= 0 && item < int (all.size ()));
+               DCPOMATIC_ASSERT (item >= 0 && item < int (all.size ()));
 
                S* dialog = new S (this);
                dialog->set (all[item]);
                dialog->ShowModal ();
                all[item] = dialog->get ();
                dialog->Destroy ();
-               
+
                for (int i = 0; i < _columns; ++i) {
                        _list->SetItem (item, i, std_to_wx (_column (all[item], i)));
                }
@@ -170,7 +175,7 @@ private:
                if (i == -1) {
                        return;
                }
-               
+
                _list->DeleteItem (i);
                std::vector<T> all = _get ();
                all.erase (all.begin() + i);