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

@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/xrc/xh_mdi.h
-// Purpose:     XML resource handler for dialogs
+// Purpose:     XML resource handler for wxMDI
 // Author:      David M. Falkinder & Vaclav Slavik
 // Created:     14/02/2005
 // RCS-ID:      $Id$
@@ -13,12 +13,14 @@
 
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_MDI
+#if wxUSE_XRC && wxUSE_MDI
 
 class WXDLLIMPEXP_CORE wxWindow;
 
 class WXDLLIMPEXP_XRC wxMdiXmlHandler : public wxXmlResourceHandler
 {
+    DECLARE_DYNAMIC_CLASS(wxMdiXmlHandler)
+
 public:
     wxMdiXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -26,10 +28,8 @@ public:
 
 private:
     wxWindow *CreateFrame();
-
-    DECLARE_DYNAMIC_CLASS(wxMdiXmlHandler)
 };
 
-#endif // wxUSE_MDI
+#endif // wxUSE_XRC && wxUSE_MDI
 
 #endif // _WX_XH_MDI_H_