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 f90d219f81a9a0f7defc398f287efa478edd2ab8..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
                )
@@ -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;