fixing 10.5 only compiles

[wxWidgets.git] / include / wx / xrc / xh_mdi.h

diff --git a/include/wx/xrc/xh_mdi.h b/include/wx/xrc/xh_mdi.h
index 7d5d8809cea45122a0485b8b012cb7665f666062..4eab9a0237e994bcd3c297ae7b9b92c8347007ec 100644 (file)
--- a/include/wx/xrc/xh_mdi.h
+++ b/include/wx/xrc/xh_mdi.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_mdi.h
-// Purpose:     XML resource handler for dialogs
+// Name:        wx/xrc/xh_mdi.h
+// Purpose:     XML resource handler for wxMDI

 // Author:      David M. Falkinder & Vaclav Slavik
 // Created:     14/02/2005
 // RCS-ID:      $Id$
 // Author:      David M. Falkinder & Vaclav Slavik
 // Created:     14/02/2005
 // RCS-ID:      $Id$


@@ -11,29 +11,25 @@
 #ifndef _WX_XH_MDI_H_
 #define _WX_XH_MDI_H_
 
 #ifndef _WX_XH_MDI_H_
 #define _WX_XH_MDI_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "xh_mdi.h"
-#endif
-

 #include "wx/xrc/xmlres.h"
 
 #include "wx/xrc/xmlres.h"
 

-#if wxUSE_MDI
+#if wxUSE_XRC && wxUSE_MDI

 
 

-class WXDLLIMPEXP_CORE wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 class WXDLLIMPEXP_XRC wxMdiXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxMdiXmlHandler : public wxXmlResourceHandler
 {

+    DECLARE_DYNAMIC_CLASS(wxMdiXmlHandler)
+

 public:
     wxMdiXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 
 private:
 public:
     wxMdiXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 
 private:

-    wxFrame *CreateFrame();
-
-    DECLARE_DYNAMIC_CLASS(wxMdiXmlHandler)
+    wxWindow *CreateFrame();

 };
 
 };
 

-#endif // wxUSE_MDI
+#endif // wxUSE_XRC && wxUSE_MDI

 
 #endif // _WX_XH_MDI_H_
 
 #endif // _WX_XH_MDI_H_