From 6a810bd82fa49706f469708c7305ab650c31ba6b Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@gmail.com>
Date: Tue, 2 Jan 2018 12:01:00 -0500
Subject: [PATCH] Fix Windows Build

---
 src/widgets/ErrorDialog.h    |  4 ++--
 src/widgets/wxPanelWrapper.h | 23 ++++++++---------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/widgets/ErrorDialog.h b/src/widgets/ErrorDialog.h
index 83d20f559..a3613e8b1 100644
--- a/src/widgets/ErrorDialog.h
+++ b/src/widgets/ErrorDialog.h
@@ -113,7 +113,7 @@ public:
          long style = wxTextEntryDialogStyle,
          const wxPoint& pos = wxDefaultPosition)
    : wxTabTraversalWrapper< wxTextEntryDialog>
-      { parent, message, caption, value, style, pos }
+      ( parent, message, caption, value, style, pos )
    {}
 };
 
@@ -129,7 +129,7 @@ public:
          long style = wxOK|wxCENTRE,
          const wxPoint& pos = wxDefaultPosition)
    : wxTabTraversalWrapper< wxMessageDialog>
-      { parent, message, caption, style, pos }
+      ( parent, message, caption, style, pos )
    {}
 };
 
diff --git a/src/widgets/wxPanelWrapper.h b/src/widgets/wxPanelWrapper.h
index aee8c763c..a3330a337 100644
--- a/src/widgets/wxPanelWrapper.h
+++ b/src/widgets/wxPanelWrapper.h
@@ -20,17 +20,12 @@ class wxTabTraversalWrapper : public Base
 {
 public:
    template <typename... Args>
-   explicit wxTabTraversalWrapper(Args&&... args)
+   wxTabTraversalWrapper(Args&&... args)
    : Base( std::forward<Args>(args)... )
    {
       this->Bind(wxEVT_CHAR_HOOK, wxTabTraversalWrapperCharHook);
    }
 
-   wxTabTraversalWrapper(const wxTabTraversalWrapper&) = delete;
-   wxTabTraversalWrapper(wxTabTraversalWrapper&&) = delete;
-   wxTabTraversalWrapper& operator=(const wxTabTraversalWrapper&) = delete;
-   wxTabTraversalWrapper& operator=(wxTabTraversalWrapper&&) = delete;
-
    ~wxTabTraversalWrapper()
    {
       this->Unbind(wxEVT_CHAR_HOOK, wxTabTraversalWrapperCharHook);
@@ -41,9 +36,9 @@ class wxPanelWrapper : public wxTabTraversalWrapper<wxPanel>
 {
 public:
    // Constructors
-   wxPanelWrapper() = default;
+   wxPanelWrapper() {}
 
-   explicit wxPanelWrapper(
+   wxPanelWrapper(
          wxWindow *parent,
          wxWindowID winid = wxID_ANY,
          const wxPoint& pos = wxDefaultPosition,
@@ -74,10 +69,10 @@ class wxDialogWrapper : public wxTabTraversalWrapper<wxDialog>
 {
 public:
    // Constructors
-   wxDialogWrapper() = default;
+   wxDialogWrapper() {}
 
    // Constructor with no modal flag - the new convention.
-   explicit wxDialogWrapper(
+   wxDialogWrapper(
       wxWindow *parent, wxWindowID id,
       const wxString& title,
       const wxPoint& pos = wxDefaultPosition,
@@ -110,10 +105,8 @@ public:
 class wxDirDialogWrapper : public wxTabTraversalWrapper<wxDirDialog>
 {
 public:
-   wxDirDialogWrapper() = default;
-
    // Constructor with no modal flag - the new convention.
-   explicit wxDirDialogWrapper(
+   wxDirDialogWrapper(
       wxWindow *parent,
       const wxString& message = _("Select a directory"),
       const wxString& defaultPath = wxT(""),
@@ -148,10 +141,10 @@ public:
 class FileDialogWrapper : public wxTabTraversalWrapper<FileDialog>
 {
 public:
-   FileDialogWrapper() = default;
+   FileDialogWrapper() {}
 
    // Constructor with no modal flag - the new convention.
-   explicit FileDialogWrapper(
+   FileDialogWrapper(
       wxWindow *parent,
       const wxString& message = _("Select a file"),
       const wxString& defaultDir = wxEmptyString,