do platform-specific checks after ensuring that the symbols we use are defined; extra...

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

diff --git a/include/wx/xrc/xh_treebk.h b/include/wx/xrc/xh_treebk.h
index 87880005e9b0cae49dc79d91856269aacf8a21e4..903dad1e375b194e74619179134f49b29636c14b 100644 (file)
--- a/include/wx/xrc/xh_treebk.h
+++ b/include/wx/xrc/xh_treebk.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_treebk.h
+// Name:        wx/xrc/xh_treebk.h

 // Purpose:     XML resource handler for wxTreebook
 // Author:      Evgeniy Tarassov
 // Created:     2005/09/28
 // Purpose:     XML resource handler for wxTreebook
 // Author:      Evgeniy Tarassov
 // Created:     2005/09/28


@@ -12,9 +12,9 @@
 
 #include "wx/xrc/xmlres.h"
 
 
 #include "wx/xrc/xmlres.h"
 

-#if wxUSE_TREEBOOK
+#if wxUSE_XRC && wxUSE_TREEBOOK

 
 

-#include "wx/treebook.h"
+class  WXDLLEXPORT wxTreebook;

 #include "wx/dynarray.h"
 
 WX_DEFINE_USER_EXPORTED_ARRAY_SIZE_T(size_t, wxArrayTbkPageIndexes,
 #include "wx/dynarray.h"
 
 WX_DEFINE_USER_EXPORTED_ARRAY_SIZE_T(size_t, wxArrayTbkPageIndexes,


@@ -30,6 +30,8 @@ WX_DEFINE_USER_EXPORTED_ARRAY_SIZE_T(size_t, wxArrayTbkPageIndexes,
 // it cannot be greater than the previous page depth plus one
 class WXDLLIMPEXP_XRC wxTreebookXmlHandler : public wxXmlResourceHandler
 {
 // it cannot be greater than the previous page depth plus one
 class WXDLLIMPEXP_XRC wxTreebookXmlHandler : public wxXmlResourceHandler
 {

+    DECLARE_DYNAMIC_CLASS(wxTreebookXmlHandler)
+

 public:
     wxTreebookXmlHandler();
     virtual wxObject *DoCreateResource();
 public:
     wxTreebookXmlHandler();
     virtual wxObject *DoCreateResource();


@@ -39,8 +41,6 @@ private:
     wxTreebook *m_tbk;
     wxArrayTbkPageIndexes m_treeContext;
     bool m_isInside;
     wxTreebook *m_tbk;
     wxArrayTbkPageIndexes m_treeContext;
     bool m_isInside;

-
-    DECLARE_DYNAMIC_CLASS(wxTreebookXmlHandler)

 };
 
 
 };
 
 


@@ -78,7 +78,6 @@ private:
 //  ...
 //</resource>
 
 //  ...
 //</resource>
 

-#endif // wxUSE_TREEBOOK
+#endif // wxUSE_XRC && wxUSE_TREEBOOK

 
 #endif // _WX_XH_TREEBK_H_
 
 #endif // _WX_XH_TREEBK_H_

-