X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/895cc205971a8b28583ddb27161e4adf045114a4..f1f5f16f780bb41aa2ea24ccbf728f14c86cc475:/src/generic/propdlg.cpp?ds=sidebyside diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp index 12dae96c82..15cd495c34 100644 --- a/src/generic/propdlg.cpp +++ b/src/generic/propdlg.cpp @@ -40,6 +40,9 @@ #if wxUSE_LISTBOOK #include "wx/listbook.h" #endif +#if wxUSE_TREEBOOK +#include "wx/treebook.h" +#endif #include "wx/generic/propdlg.h" #include "wx/sysopt.h" @@ -116,15 +119,11 @@ void wxPropertySheetDialog::CreateButtons(int flags) #endif wxSizer *buttonSizer = CreateButtonSizer( flags & ButtonSizerFlags ); - if(buttonSizer->GetChildren().GetCount() > 0 ) + if( buttonSizer ) { m_innerSizer->Add( buttonSizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT|wxRIGHT, 2); m_innerSizer->AddSpacer(2); } - else - { - delete buttonSizer; - } #ifdef __POCKETPC__ // restore system option @@ -159,6 +158,10 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl() #if wxUSE_LISTBOOK if (GetSheetStyle() & wxPROPSHEET_LISTBOOK) bookCtrl = new wxListbook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style ); +#endif +#if wxUSE_TREEBOOK + if (GetSheetStyle() & wxPROPSHEET_TREEBOOK) + bookCtrl = new wxTreebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style ); #endif if (!bookCtrl) bookCtrl = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );