Warning fix, minor source cleaning and better !PCH support.

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

diff --git a/src/xrc/xh_treebk.cpp b/src/xrc/xh_treebk.cpp
index 9b4513fdcc24ccdb289f6cd97db7f37c509c86ff..8f2fdaedf36813d98afbdcde7c41c83fb4bec9c2 100644 (file)
--- 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
 // Purpose:     XRC resource handler for wxTreebook
 // Author:      Evgeniy Tarassov
 // Created:     2005/09/28


@@ -19,18 +19,25 @@
 
 #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(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();
 }
 
     AddWindowStyles();
 }


@@ -92,7 +99,7 @@ wxObject *wxTreebookXmlHandler::DoCreateResource()
     }
 
     size_t depth = GetLong( wxT("depth") );
     }
 
     size_t depth = GetLong( wxT("depth") );

-    
+

     if( depth <= m_treeContext.Count() )
     {
         // first prepare the icon
     if( depth <= m_treeContext.Count() )
     {
         // first prepare the icon


@@ -119,12 +126,12 @@ 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);
         }

-        
+

         m_treeContext.Add( m_tbk->GetPageCount() - 1);
         m_treeContext.Add( m_tbk->GetPageCount() - 1);

-        
+

     }
     else
         wxLogError(wxT("Error in resource. wxTreebookPage has an invalid depth."));
     }
     else
         wxLogError(wxT("Error in resource. wxTreebookPage has an invalid depth."));