X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eca15c0d5497309e402d4bb91f8e479b4fb70fa9..991d57f8443fc8a31c2ad3e3a8180af08a6394d6:/include/wx/xrc/xh_treebk.h

diff --git a/include/wx/xrc/xh_treebk.h b/include/wx/xrc/xh_treebk.h
index cc2cd4d479..87880005e9 100644
--- a/include/wx/xrc/xh_treebk.h
+++ b/include/wx/xrc/xh_treebk.h
@@ -15,8 +15,10 @@
 #if wxUSE_TREEBOOK
 
 #include "wx/treebook.h"
+#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)
 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;
+
+    DECLARE_DYNAMIC_CLASS(wxTreebookXmlHandler)
 };
 
 
@@ -75,7 +78,7 @@ private:
 //  ...
 //</resource>
 
-#endif
+#endif // wxUSE_TREEBOOK
 
 #endif // _WX_XH_TREEBK_H_