Merge branch 'use-scrollbar-fixes'

Minor fixes, mostly add wxUSE_SCROLLBAR guards.

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

include/wx/chkconf.h

@@ -2345,6 +2345,15 @@
 #           define wxUSE_STC 0
 #       endif
 #   endif
+
+#   if !wxUSE_SCROLLBAR
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxStyledTextCtrl requires wxUSE_SCROLLBAR"
+#       else
+#           undef wxUSE_STC
+#           define wxUSE_STC 0
+#       endif
+#   endif
 #endif /* wxUSE_STC */
 
 #if wxUSE_RICHTEXT

include/wx/qt/window.h

@@ -11,6 +11,9 @@
 
 #include <list>
 
+class QShortcut;
+template < class T > class QList;
+
 class QWidget;
 class QScrollWindow;
 class QAbstractScrollArea;

include/wx/univ/scrarrow.h

@@ -11,6 +11,7 @@
 #ifndef _WX_UNIV_SCRARROW_H_
 #define _WX_UNIV_SCRARROW_H_
 
+#if wxUSE_SCROLLBAR
 // ----------------------------------------------------------------------------
 // wxScrollArrows is not a control but just a class containing the common
 // functionality of scroll arrows, whether part of scrollbars, spin ctrls or
@@ -107,5 +108,6 @@ public:
     // false to stop it
     virtual bool OnArrow(wxScrollArrows::Arrow arrow) = 0;
 };
+#endif // wxUSE_SCROLLBAR
 
 #endif // _WX_UNIV_SCRARROW_H_