From c6eb778541bf3079f82c7dde50c07d6c97134698 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 24 Jun 2004 11:59:38 +0000 Subject: [PATCH] Removed references to now-deprecated wxNotebookSizer from documentation. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/category.tex | 1 - docs/latex/wx/nbsizer.tex | 7 ++++++- docs/latex/wx/sizer.tex | 2 +- docs/latex/wx/tsamples.tex | 3 +-- docs/latex/wx/tsizer.tex | 42 -------------------------------------- 5 files changed, 8 insertions(+), 47 deletions(-) diff --git a/docs/latex/wx/category.tex b/docs/latex/wx/category.tex index f1f1945db0..5914276cc1 100644 --- a/docs/latex/wx/category.tex +++ b/docs/latex/wx/category.tex @@ -138,7 +138,6 @@ These are the classes relevant to sizer-based layout. \twocolitem{\helpref{wxGridBagSizer}{wxgridbagsizer}}{Another grid sizer that lets you specify the cell an item is in, and items can span rows and/or columns.} \twocolitem{\helpref{wxBoxSizer}{wxboxsizer}}{A sizer for laying out windows in a row or column} \twocolitem{\helpref{wxStaticBoxSizer}{wxstaticboxsizer}}{Same as wxBoxSizer, but with a surrounding static box} -\twocolitem{\helpref{wxNotebookSizer}{wxnotebooksizer}}{Sizer to use with the wxNotebook control} \end{twocollist} \overview{Constraints overview}{constraintsoverview} describes constraints-based layout. diff --git a/docs/latex/wx/nbsizer.tex b/docs/latex/wx/nbsizer.tex index 29a93e5be6..a6929d4e8f 100644 --- a/docs/latex/wx/nbsizer.tex +++ b/docs/latex/wx/nbsizer.tex @@ -1,5 +1,10 @@ \section{\class{wxNotebookSizer}}\label{wxnotebooksizer} +{\bf This class is deprecated and should not be used in new code! It is not +longer needed, \helpref{wxNotebook}{wxnotebook} control can be inserted +into any sizer class and it's minimal size will be determined correctly. +See \helpref{wxSizer overview}{sizeroverview} for more information.} + wxNotebookSizer is a specialized sizer to make sizers work in connection with using notebooks. This sizer is different from any other sizer as you must not add any children to it - instead, it queries the notebook class itself. @@ -7,7 +12,7 @@ The only thing this sizer does is to determine the size of the biggest page of the notebook and report an adjusted minimal size to a more toplevel sizer. -For more information, please see \helpref{Programming with wxNotebookSizer}{notebooksizerprogramming}. +For more information, please see \helpref{Programming with wSizer}{notebooksizerprogramming}. \wxheading{Derived from} diff --git a/docs/latex/wx/sizer.tex b/docs/latex/wx/sizer.tex index 7ab64a666f..fcb072378c 100644 --- a/docs/latex/wx/sizer.tex +++ b/docs/latex/wx/sizer.tex @@ -4,7 +4,7 @@ wxSizer is the abstract base class used for laying out subwindows in a window. Y cannot use wxSizer directly; instead, you will have to use one of the sizer classes derived from it. Currently there are \helpref{wxBoxSizer}{wxboxsizer}, \helpref{wxStaticBoxSizer}{wxstaticboxsizer}, -\helpref{wxNotebookSizer}{wxnotebooksizer}, \helpref{wxGridSizer}{wxgridsizer} +\helpref{wxGridSizer}{wxgridsizer} \helpref{wxFlexGridSizer}{wxflexgridsizer} and \helpref{wxGridBagSizer}{wxgridbagsizer}. The layout algorithm used by sizers in wxWidgets is closely related to layout diff --git a/docs/latex/wx/tsamples.tex b/docs/latex/wx/tsamples.tex index 3db6df7f17..310b5ef527 100644 --- a/docs/latex/wx/tsamples.tex +++ b/docs/latex/wx/tsamples.tex @@ -328,8 +328,7 @@ class for further information. The menu in this sample offers two more tests, one showing how to use a \helpref{wxBoxSizer}{wxboxsizer} in a simple dialog and the other one showing how to use sizers in connection with a \helpref{wxNotebook}{wxnotebook} -class. See also \helpref{wxNotebookSizer}{wxnotebooksizer} and -\helpref{wxSizer}{wxsizer}. +class. See also \helpref{wxSizer}{wxsizer}. \subsection{Listctrl sample}\label{samplelistctrl} diff --git a/docs/latex/wx/tsizer.tex b/docs/latex/wx/tsizer.tex index 766d818922..e7f106004f 100644 --- a/docs/latex/wx/tsizer.tex +++ b/docs/latex/wx/tsizer.tex @@ -3,7 +3,6 @@ Classes: \helpref{wxSizer}{wxsizer}, \helpref{wxGridSizer}{wxgridsizer}, \helpref{wxFlexGridSizer}{wxflexgridsizer}, \helpref{wxBoxSizer}{wxboxsizer}, \helpref{wxStaticBoxSizer}{wxstaticboxsizer}, -\helpref{wxNotebookSizer}{wxnotebooksizer}, \helpref{CreateButtonSizer}{createbuttonsizer} Sizers, as represented by the wxSizer class and its descendants in @@ -182,14 +181,6 @@ the same dialog as the one above, but using a flex grid sizer: \myimage{sizer11.eps} \end{center} -\wxheading{wxNotebookSizer} - -\helpref{wxNotebookSizer}{wxnotebooksizer} can be used -with notebooks. It calculates the size of each -notebook page and sets the size of the notebook to the size -of the biggest page plus some extra space required for the -notebook tabs and decorations. - \subsection{Programming with wxBoxSizer}\label{boxsizerprogramming} The basic idea behind a \helpref{wxBoxSizer}{wxboxsizer} is that windows will most often be laid out in rather @@ -289,39 +280,6 @@ height and all fields in one column having the same width, but all rows or all columns are not necessarily the same height or width as in the \helpref{wxGridSizer}{wxgridsizer}. -\subsection{Programming with wxNotebookSizer}\label{notebooksizerprogramming} - -\helpref{wxNotebookSizer}{wxnotebooksizer} is a specialized sizer to make sizers work in connection -with using notebooks. This sizer is different from any other sizer as -you must not add any children to it - instead, it queries the notebook class itself. -The only thing this sizer does is to determine the size of the biggest -page of the notebook and report an adjusted minimal size to a more toplevel -sizer. - -In order to query the size of notebook page, this page needs to have its -own sizer, otherwise the wxNotebookSizer will ignore it. Notebook pages -get their sizer by assigning one to them using \helpref{wxWindow::SetSizer}{wxwindowsetsizer} -and setting the auto-layout option to true using -\helpref{wxWindow::SetAutoLayout}{wxwindowsetautolayout}. Here is one -example showing how to add a notebook page that the notebook sizer is -aware of: - -\begin{verbatim} - wxNotebook *notebook = new wxNotebook( &dialog, -1 ); - wxNotebookSizer *nbs = new wxNotebookSizer( notebook ); - - // Add panel as notebook page - wxPanel *panel = new wxPanel( notebook, -1 ); - notebook->AddPage( panel, "My Notebook Page" ); - - wxBoxSizer *panelsizer = new wxBoxSizer( wxVERTICAL ); - - // Add controls to panel and panelsizer here... - - panel->SetAutoLayout( true ); - panel->SetSizer( panelsizer ); -\end{verbatim} - \subsection{Programming with wxStaticBoxSizer}\label{staticboxsizerprogramming} \helpref{wxStaticBoxSizer}{wxstaticboxsizer} is a sizer derived from wxBoxSizer but adds a static -- 2.45.2