renamed AddSubPage() with pos parameter to InsertSubPage()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/treebook.tex b/docs/latex/wx/treebook.tex
index 5fb0b255f8c056993b7678833af04a021613afd8..426c402e4d3c2a1e4dedf0363c551f8b3f6cc558 100644 (file)
--- a/docs/latex/wx/treebook.tex
+++ b/docs/latex/wx/treebook.tex
@@ -18,10 +18,11 @@ of preference sections on the left and select section page on the right.
 
 To use the class simply create it and populate with pages using
 \helpref{InsertPage}{wxtreebookinsertpage},
+\helpref{InsertSubPage}{wxtreebookinsertsubpage},
 \helpref{AddPage}{wxtreebookaddpage},
 \helpref{AddSubPage}{wxtreebookaddsubpage}.
 
-If your tree is no more than 1 level in depth then you could
+If your tree is no more than $1$ level in depth then you could
 simply use \helpref{AddPage}{wxtreebookaddpage} and 
 \helpref{AddSubPage}{wxtreebookaddsubpage} to sequentially populate your tree
 by adding at every step a page or a subpage to the end of the tree.
@@ -104,7 +105,7 @@ Also deletes all the pages owned by the control (inserted previously into it).
     \param{int }{imageId = wxNOT\_FOUND}}
 
 Adds a new page. The page is placed at the topmost level after all other pages.
-NULL could be specified for page to create an empty page.
+\NULL could be specified for page to create an empty page.
 
 
 
@@ -112,10 +113,8 @@ NULL could be specified for page to create an empty page.
 
 \func{bool}{AddSubPage}{\param{wxWindow* }{page}, \param{const wxString\& }{text}, \param{bool }{bSelect = false}, \param{int }{imageId = wxNOT\_FOUND}}
 
-\func{bool}{AddSubPage}{\param{size\_t }{pagePos}, \param{wxWindow* }{page}, \param{const wxString\& }{text}, \param{bool }{bSelect = false}, \param{int }{imageId = wxNOT\_FOUND}}
-
-Adds a new child-page to either the last or the specified top-level.
-NULL could be specified for page to create an empty page.
+Adds a new child-page to the last top-level page.
+\NULL could be specified for page to create an empty page.
 
 
 
@@ -215,7 +214,16 @@ depending on the platform and so wxTreebookEvent::GetSelection should be used in
 
 Inserts a new page just before the page indicated by pagePos.
 The new page is placed before pagePos page and on the same level.
-NULL could be specified for page to create an empty page.
+\NULL could be specified for page to create an empty page.
+
+
+\membersection{wxTreebook::InsertSubPage}\label{wxtreebookinsertsubpage}
+
+\func{bool}{InsertSubPage}{\param{size\_t }{pagePos}, \param{wxWindow* }{page}, \param{const wxString\& }{text}, \param{bool }{bSelect = false}, \param{int }{imageId = wxNOT\_FOUND}}
+
+Inserts a sub page under the specified page.
+
+\NULL could be specified for page to create an empty page.
 
 
 \membersection{wxTreebook::IsNodeExpanded}\label{wxtreebookisnodeexpanded}

diff --git a/include/wx/treebook.h b/include/wx/treebook.h
index fc3fa7731ef429b839095052230075ac80b669cf..7209e7c1fef5d324016b69bfbf0294c8c2999097 100644 (file)
--- a/include/wx/treebook.h
+++ b/include/wx/treebook.h
@@ -77,11 +77,11 @@ public:
                             int imageId = wxNOT_FOUND);
 
     // Inserts a new sub-page to the end of children of the page at given pos.
-    virtual bool AddSubPage(size_t pos,
-                            wxWindow *page,
-                            const wxString& text,
-                            bool bSelect = false,
-                            int imageId = wxNOT_FOUND);
+    virtual bool InsertSubPage(size_t pos,
+                               wxWindow *page,
+                               const wxString& text,
+                               bool bSelect = false,
+                               int imageId = wxNOT_FOUND);
 
     // Adds a new page at top level after all other pages.
     virtual bool AddPage(wxWindow *page,

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 066fe3b2e7a5f880c27cf10fb38046238cd646cc..b0eb08c72fba382ec1f7514fb1a4a1fe02158b37 100644 (file)
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -436,7 +436,7 @@ void MyFrame::RecreateBook()
                 if ( parent != wxNOT_FOUND )
                 {
                     wxStaticCast(m_bookCtrl, wxTreebook)->
-                        AddSubPage(parent, page, str, false, image);
+                        InsertSubPage(parent, page, str, false, image);
 
                     // skip adding it again below
                     continue;
@@ -600,15 +600,18 @@ void MyFrame::OnAddSubPage(wxCommandEvent& WXUNUSED(event))
         }
 
         static unsigned s_subPageAdded = 0;
-        currBook->AddSubPage(selPos,
-                             CreateNewPage(),
-                             wxString::Format
-                             (
-                                ADDED_SUB_PAGE_NAME wxT("%u"),
-                                ++s_subPageAdded
-                             ),
-                             true,
-                             GetIconIndex(currBook));
+        currBook->InsertSubPage
+                  (
+                    selPos,
+                    CreateNewPage(),
+                    wxString::Format
+                    (
+                     ADDED_SUB_PAGE_NAME wxT("%u"),
+                     ++s_subPageAdded
+                    ),
+                    true,
+                    GetIconIndex(currBook)
+                  );
     }
 }
 

diff --git a/src/generic/treebkg.cpp b/src/generic/treebkg.cpp
index 47fefdc7d06b7cdc616880bc42334f5da1feffc0..a5d5c88358f526fbc64da7265563c7aeb0e48cbb 100644 (file)
--- a/src/generic/treebkg.cpp
+++ b/src/generic/treebkg.cpp
@@ -125,11 +125,11 @@ bool wxTreebook::InsertPage(size_t pagePos,
     return DoInsertPage(pagePos, page, text, bSelect, imageId);
 }
 
-bool wxTreebook::AddSubPage(size_t pagePos,
-                            wxWindow *page,
-                            const wxString& text,
-                            bool bSelect,
-                            int imageId)
+bool wxTreebook::InsertSubPage(size_t pagePos,
+                               wxWindow *page,
+                               const wxString& text,
+                               bool bSelect,
+                               int imageId)
 {
     return DoInsertSubPage(pagePos, page, text, bSelect, imageId);
 }