X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eca15c0d5497309e402d4bb91f8e479b4fb70fa9..623d5f80029803f1394e89732e16e19e82a22e2a:/src/xrc/xh_treebk.cpp?ds=sidebyside

diff --git a/src/xrc/xh_treebk.cpp b/src/xrc/xh_treebk.cpp
index 9b4513fdcc..8f2fdaedf3 100644
--- a/src/xrc/xh_treebk.cpp
+++ b/src/xrc/xh_treebk.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_treebk.cpp
+// Name:        src/xrc/xh_treebk.cpp
 // Purpose:     XRC resource handler for wxTreebook
 // Author:      Evgeniy Tarassov
 // Created:     2005/09/28
@@ -19,18 +19,25 @@
 
 #include "wx/xrc/xh_treebk.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+
 #include "wx/treebook.h"
 #include "wx/imaglist.h"
-#include "wx/log.h"
 
 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(wxTBK_DEFAULT);
-    XRC_ADD_STYLE(wxTBK_LEFT);
-    XRC_ADD_STYLE(wxTBK_RIGHT);
+    XRC_ADD_STYLE(wxBK_DEFAULT);
+    XRC_ADD_STYLE(wxBK_TOP);
+    XRC_ADD_STYLE(wxBK_BOTTOM);
+    XRC_ADD_STYLE(wxBK_LEFT);
+    XRC_ADD_STYLE(wxBK_RIGHT);
 
     AddWindowStyles();
 }
@@ -92,7 +99,7 @@ wxObject *wxTreebookXmlHandler::DoCreateResource()
     }
 
     size_t depth = GetLong( wxT("depth") );
-    
+
     if( depth <= m_treeContext.Count() )
     {
         // first prepare the icon
@@ -119,12 +126,12 @@ wxObject *wxTreebookXmlHandler::DoCreateResource()
         }
         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);
         }
-        
+
         m_treeContext.Add( m_tbk->GetPageCount() - 1);
-        
+
     }
     else
         wxLogError(wxT("Error in resource. wxTreebookPage has an invalid depth."));