Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deprecated wxBookCtrlSizer and wxNotebookSizer, they are no longer needed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-24 11:58:06 +00:00
parent 19b44116d5
commit adbf2d732f
9 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/sizer.cpp
View File

@@ -24,8 +24,10 @@
#include "wx/sizer.h"
#include "wx/utils.h"
#include "wx/statbox.h"
#include "wx/notebook.h"
#include "wx/listimpl.cpp"
#if WXWIN_COMPATIBILITY_2_4
#include "wx/notebook.h"
#endif
#ifdef __WXMAC__
# include "wx/mac/uma.h"
@@ -41,12 +43,6 @@ IMPLEMENT_CLASS(wxBoxSizer, wxSizer)
#if wxUSE_STATBOX
IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
#endif
#if wxUSE_BOOKCTRL
IMPLEMENT_CLASS(wxBookCtrlSizer, wxSizer)
#if wxUSE_NOTEBOOK
IMPLEMENT_CLASS(wxNotebookSizer, wxBookCtrlSizer)
#endif // wxUSE_NOTEBOOK
#endif // wxUSE_BOOKCTRL
WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
@@ -1643,10 +1639,20 @@ void wxStaticBoxSizer::ShowItems( bool show )
#endif // wxUSE_STATBOX
#if WXWIN_COMPATIBILITY_2_4
// ----------------------------------------------------------------------------
// wxNotebookSizer
// ----------------------------------------------------------------------------
#if wxUSE_BOOKCTRL
IMPLEMENT_CLASS(wxBookCtrlSizer, wxSizer)
#if wxUSE_NOTEBOOK
IMPLEMENT_CLASS(wxNotebookSizer, wxBookCtrlSizer)
#endif // wxUSE_NOTEBOOK
#endif // wxUSE_BOOKCTRL
#if wxUSE_BOOKCTRL
wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrl *bookctrl)
@@ -1698,14 +1704,15 @@ wxSize wxBookCtrlSizer::CalcMin()
return wxSize( maxX, maxY ) + sizeBorder;
}
#if wxUSE_NOTEBOOK
wxNotebookSizer::wxNotebookSizer(wxNotebook *nb)
: wxBookCtrlSizer(nb)
{
wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a control") );
m_bookctrl = nb;
}
#endif // wxUSE_NOTEBOOOK
#endif // wxUSE_BOOKCTRL
#endif // WXWIN_COMPATIBILITY_2_4