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_gauge.h

@@ -11,12 +11,9 @@
 #ifndef _WX_XH_GAUGE_H_
 #define _WX_XH_GAUGE_H_
 
-#include "wx/defs.h"
-
-#if wxUSE_GAUGE
-
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC && wxUSE_GAUGE
 
 class WXDLLIMPEXP_XRC wxGaugeXmlHandler : public wxXmlResourceHandler
 {
@@ -32,6 +29,6 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_GAUGE
 
 #endif // _WX_XH_GAUGE_H_