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

@@ -9,17 +9,16 @@
 #ifndef _WX_XH_CHOICEBK_H_
 #define _WX_XH_CHOICEBK_H_
 
-#include "wx/defs.h"
+#include "wx/xrc/xmlres.h"
 
 #if wxUSE_XRC && wxUSE_CHOICEBOOK
 
-#include "wx/xrc/xmlres.h"
-
 class WXDLLEXPORT wxChoicebook;
 
 class WXDLLIMPEXP_XRC wxChoicebookXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxChoicebookXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxChoicebookXmlHandler)
+
 public:
     wxChoicebookXmlHandler();
     virtual wxObject *DoCreateResource();