check that the version of __sync_sub_and_fetch that returns a value is supported...

[wxWidgets.git] / src / xrc / xh_treebk.cpp

diff --git a/src/xrc/xh_treebk.cpp b/src/xrc/xh_treebk.cpp
index a79a01b9a34e818e785fb533520603bc97f44f82..d3d427dfba7f35fed7cfa7197b1b01177c74ca15 100644 (file)
--- a/src/xrc/xh_treebk.cpp
+++ b/src/xrc/xh_treebk.cpp
@@ -19,14 +19,19 @@
 
 #include "wx/xrc/xh_treebk.h"
 
 
 #include "wx/xrc/xh_treebk.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+

 #include "wx/treebook.h"
 #include "wx/imaglist.h"
 #include "wx/treebook.h"
 #include "wx/imaglist.h"

-#include "wx/log.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxTreebookXmlHandler, wxXmlResourceHandler)
 
 wxTreebookXmlHandler::wxTreebookXmlHandler()
 
 IMPLEMENT_DYNAMIC_CLASS(wxTreebookXmlHandler, wxXmlResourceHandler)
 
 wxTreebookXmlHandler::wxTreebookXmlHandler()

-: wxXmlResourceHandler(), m_isInside(false), m_tbk(NULL), m_treeContext()
+                    : wxXmlResourceHandler(),
+                      m_tbk(NULL),
+                      m_isInside(false)

 {
     XRC_ADD_STYLE(wxBK_DEFAULT);
     XRC_ADD_STYLE(wxBK_TOP);
 {
     XRC_ADD_STYLE(wxBK_DEFAULT);
     XRC_ADD_STYLE(wxBK_TOP);


@@ -95,7 +100,7 @@ wxObject *wxTreebookXmlHandler::DoCreateResource()
 
     size_t depth = GetLong( wxT("depth") );
 
 
     size_t depth = GetLong( wxT("depth") );
 

-    if( depth <= m_treeContext.Count() )
+    if( depth <= m_treeContext.GetCount() )

     {
         // first prepare the icon
         int imgIndex = wxNOT_FOUND;
     {
         // first prepare the icon
         int imgIndex = wxNOT_FOUND;


@@ -112,8 +117,8 @@ wxObject *wxTreebookXmlHandler::DoCreateResource()
         }
 
         // then add the page to the corresponding parent
         }
 
         // then add the page to the corresponding parent

-        if( depth < m_treeContext.Count() )
-            m_treeContext.RemoveAt(depth, m_treeContext.Count() - depth );
+        if( depth < m_treeContext.GetCount() )
+            m_treeContext.RemoveAt(depth, m_treeContext.GetCount() - depth );

         if( depth == 0)
         {
             m_tbk->AddPage(wnd,
         if( depth == 0)
         {
             m_tbk->AddPage(wnd,


@@ -121,7 +126,7 @@ wxObject *wxTreebookXmlHandler::DoCreateResource()
         }
         else
         {
         }
         else
         {

-            m_tbk->AddSubPage(m_treeContext.Item(depth - 1), wnd,
+            m_tbk->InsertSubPage(m_treeContext.Item(depth - 1), wnd,

                 GetText(wxT("label")), GetBool(wxT("selected")), imgIndex);
         }
 
                 GetText(wxT("label")), GetBool(wxT("selected")), imgIndex);
         }