fixes for compilation with wxUSE_XXX==0 and some other minor fixes (patch 1569904)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/xrc/xh_scrol.h

@@ -12,9 +12,8 @@
 #define _WX_XH_SCROL_H_
 
 #include "wx/xrc/xmlres.h"
-#include "wx/defs.h"
-
 
+#if wxUSE_XRC && wxUSE_SCROLLBAR
 
 class WXDLLIMPEXP_XRC wxScrollBarXmlHandler : public wxXmlResourceHandler
 {
@@ -32,5 +31,6 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC && wxUSE_SCROLLBAR
 
 #endif // _WX_XH_SCROL_H_