added wxTo/FromString() overloads for wxFont (1st part of patch 1760073)

[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 cc2cd4d479ad8d90c94c79419a5cf2a42352bee2..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
@@ -12,11 +12,13 @@
 
 #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_ARRAY_INT(size_t, wxArrayTbkPageIndexes);
+WX_DEFINE_USER_EXPORTED_ARRAY_SIZE_T(size_t, wxArrayTbkPageIndexes,
+                                     class WXDLLIMPEXP_XRC);
 
 // ---------------------------------------------------------------------
 // wxTreebookXmlHandler class
@@ -28,16 +30,17 @@ WX_DEFINE_ARRAY_INT(size_t, wxArrayTbkPageIndexes);
 // it cannot be greater than the previous page depth plus one
 class WXDLLIMPEXP_XRC wxTreebookXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxTreebookXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxTreebookXmlHandler)
+
 public:
     wxTreebookXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 
 private:
-    bool m_isInside;
-    wxTreebook * m_tbk;
+    wxTreebook *m_tbk;
     wxArrayTbkPageIndexes m_treeContext;
+    bool m_isInside;
 };
 
 
@@ -75,7 +78,6 @@ private:
 //  ...
 //</resource>
 
-#endif
+#endif // wxUSE_XRC && wxUSE_TREEBOOK
 
 #endif // _WX_XH_TREEBK_H_
-