Disable warnings around all wx includes.

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

diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index d53da6cbee7c42a359cfbdbf8cd7944db19e0eaa..6bf7f7b628421d3937b8771997af70036940081e 100644 (file)
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -18,16 +18,21 @@
 
 */
 
+
 #ifndef DCPOMATIC_EDITABLE_LIST_H
 #define DCPOMATIC_EDITABLE_LIST_H
 
-#include "wx_util.h"
+
 #include "dcpomatic_button.h"
-#include <wx/wx.h>
+#include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
-#include <boost/function.hpp>
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <vector>
 
+
 class EditableListColumn
 {
 public:
@@ -60,9 +65,9 @@ public:
        EditableList (
                wxWindow* parent,
                std::vector<EditableListColumn> columns,
-               boost::function<std::vector<T> ()> get,
-               boost::function<void (std::vector<T>)> set,
-               boost::function<std::string (T, int)> column,
+               std::function<std::vector<T> ()> get,
+               std::function<void (std::vector<T>)> set,
+               std::function<std::string (T, int)> column,
                bool can_edit = true,
                bool title = true
                )
@@ -78,12 +83,12 @@ public:
                SetSizer (_sizer);
 
                long style = wxLC_REPORT | wxLC_SINGLE_SEL;
-               if (title) {
+               if (!title) {
                        style |= wxLC_NO_HEADER;
                }
 
                int total_width = 0;
-               BOOST_FOREACH (EditableListColumn i, _columns) {
+               for (auto i: _columns) {
                        total_width += i.width.get_value_or (_default_width);
                }
 
@@ -101,7 +106,7 @@ public:
 #endif
 
                int j = 0;
-               BOOST_FOREACH (EditableListColumn i, _columns) {
+               for (auto i: _columns) {
                        wxListItem ip;
                        ip.SetId (j);
                        ip.SetText (i.name);
@@ -118,13 +123,13 @@ public:
                {
                        wxSizer* s = new wxBoxSizer (wxVERTICAL);
                        _add = new Button (this, _("Add..."));
-                       s->Add (_add, 0, wxTOP | wxBOTTOM, 2);
+                       s->Add (_add, 1, wxEXPAND | wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
                        if (can_edit) {
                                _edit = new Button (this, _("Edit..."));
-                               s->Add (_edit, 0, wxTOP | wxBOTTOM, 2);
+                               s->Add (_edit, 1, wxEXPAND | wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
                        }
                        _remove = new Button (this, _("Remove"));
-                       s->Add (_remove, 0, wxTOP | wxBOTTOM, 2);
+                       s->Add (_remove, 1, wxEXPAND | wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
                        _sizer->Add (s, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
                }
 
@@ -268,7 +273,7 @@ private:
                int fixed_width = 0;
                int growable = 0;
                int j = 0;
-               BOOST_FOREACH (EditableListColumn i, _columns) {
+               for (auto i: _columns) {
                        fixed_width += i.width.get_value_or (_default_width);
                        if (!i.growable) {
                                _list->SetColumnWidth (j, i.width.get_value_or(_default_width));
@@ -279,7 +284,7 @@ private:
                }
 
                j = 0;
-               BOOST_FOREACH (EditableListColumn i, _columns) {
+               for (auto i: _columns) {
                        if (i.growable) {
                                _list->SetColumnWidth (j, i.width.get_value_or(_default_width) + (w - fixed_width) / growable);
                        }
@@ -289,10 +294,10 @@ private:
                ev.Skip ();
        }
 
-       boost::function <std::vector<T> ()> _get;
-       boost::function <void (std::vector<T>)> _set;
+       std::function <std::vector<T> ()> _get;
+       std::function <void (std::vector<T>)> _set;
        std::vector<EditableListColumn> _columns;
-       boost::function<std::string (T, int)> _column;
+       std::function<std::string (T, int)> _column;
 
        wxButton* _add;
        wxButton* _edit;