projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use wxClockMillis_t to fix wxUSE_LONGLONG=0 compilation
[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 deb9111b081453b3f85700a4eaf849f1c1f0036f..87880005e9b0cae49dc79d91856269aacf8a21e4 100644
(file)
--- 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"
#if wxUSE_TREEBOOK
#include "wx/treebook.h"
+#include "wx/dynarray.h"
-WX_DEFINE_ARRAY_SIZE_T(size_t, wxArrayTbkPageIndexes);
+WX_DEFINE_USER_EXPORTED_ARRAY_SIZE_T(size_t, wxArrayTbkPageIndexes,
+ class WXDLLIMPEXP_XRC);
// ---------------------------------------------------------------------
// wxTreebookXmlHandler class
// ---------------------------------------------------------------------
// wxTreebookXmlHandler class
@@
-28,16
+30,17
@@
WX_DEFINE_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();
virtual bool CanHandle(wxXmlNode *node);
private:
public:
wxTreebookXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
private:
- bool m_isInside;
- wxTreebook * m_tbk;
+ wxTreebook *m_tbk;
wxArrayTbkPageIndexes m_treeContext;
wxArrayTbkPageIndexes m_treeContext;
+ bool m_isInside;
+
+ DECLARE_DYNAMIC_CLASS(wxTreebookXmlHandler)
};
};
@@
-75,7
+78,7
@@
private:
// ...
//</resource>
// ...
//</resource>
-#endif
+#endif
// wxUSE_TREEBOOK
#endif // _WX_XH_TREEBK_H_
#endif // _WX_XH_TREEBK_H_