Hopefully, this wxPanelWrapper will work with both VS2013 and VS2017.

henricj · Oct 17, 2018 · cf4e98e · cf4e98e
1 parent 7a1ecc4
commit cf4e98e
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/widgets/wxPanelWrapper.h b/src/widgets/wxPanelWrapper.h
@@ -12,6 +12,7 @@
 #include "../MemoryX.h"
 #include <wx/panel.h>
 #include <wx/dialog.h>
+#include <wx/windowid.h>
 
 #include "../Internat.h"
 
@@ -39,7 +40,12 @@ class AUDACITY_DLL_API wxPanelWrapper : public wxTabTraversalWrapper<wxPanel>
 {
 public:
    // Constructors
-   wxPanelWrapper() {}
+   wxPanelWrapper() = default;
+
+   wxPanelWrapper(const wxPanelWrapper&) = delete;
+   wxPanelWrapper& operator=(const wxPanelWrapper&) = delete;
+   wxPanelWrapper(wxPanelWrapper&&) = delete;
+   wxPanelWrapper& operator=(wxPanelWrapper&&) = delete;
 
    wxPanelWrapper(
          wxWindow *parent,
@@ -72,7 +78,7 @@ class AUDACITY_DLL_API wxDialogWrapper : public wxTabTraversalWrapper<wxDialog>
 {
 public:
    // Constructors
-   wxDialogWrapper() {}
+   wxDialogWrapper() = default;
 
    // Constructor with no modal flag - the new convention.
    wxDialogWrapper(
@@ -144,7 +150,7 @@ class AUDACITY_DLL_API wxDirDialogWrapper : public wxTabTraversalWrapper<wxDirDi
 class AUDACITY_DLL_API FileDialogWrapper : public wxTabTraversalWrapper<FileDialog>
 {
 public:
-   FileDialogWrapper() {}
+   FileDialogWrapper() = default;
 
    // Constructor with no modal flag - the new convention.
    FileDialogWrapper(