Merge branch 'build-option-fixes' of https://github.com/MaartenBent/wxWidgets

Miscellaneous build options fixes.

See https://github.com/wxWidgets/wxWidgets/pull/1661

include/wx/dcsvg.h

@@ -324,12 +324,7 @@ public:
     void SetShapeRenderingMode(wxSVGShapeRenderingMode renderingMode);
 
 private:
-    wxSVGFileDC()
-        : wxDC(new wxSVGFileDCImpl(this, wxString()))
-    {
-    }
-
-    wxDECLARE_DYNAMIC_CLASS(wxSVGFileDC);
+    wxDECLARE_ABSTRACT_CLASS(wxSVGFileDC);
 };
 
 #endif // wxUSE_SVG

include/wx/msw/chkconf.h

@@ -381,6 +381,15 @@
 #           define wxUSE_DRAG_AND_DROP 0
 #       endif
 #   endif
+
+#   if wxUSE_ACCESSIBILITY
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_ACCESSIBILITY requires wxUSE_OLE"
+#       else
+#           undef wxUSE_ACCESSIBILITY
+#           define wxUSE_ACCESSIBILITY 0
+#       endif
+#   endif
 #endif /* !wxUSE_OLE */
 
 #if !wxUSE_ACTIVEX

include/wx/propgrid/props.h

@@ -575,7 +575,7 @@ protected:
 class WXDLLIMPEXP_PROPGRID wxEditorDialogProperty : public wxPGProperty
 {
     friend class wxPGDialogAdapter;
-    wxDECLARE_ABSTRACT_CLASS(wxDialogProperty);
+    wxDECLARE_ABSTRACT_CLASS(wxEditorDialogProperty);
 
 public:
     virtual ~wxEditorDialogProperty();