X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffc71ce59daf0b93697aac0a50bb3fdb9391b0ca..66f75561893ea7b4bf429d1882d9cc0407ba932d:/src/common/dlgcmn.cpp?ds=sidebyside diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp index fbe2106009..69e0180b86 100644 --- a/src/common/dlgcmn.cpp +++ b/src/common/dlgcmn.cpp @@ -633,6 +633,7 @@ bool wxStandardDialogLayoutAdapter::DoLayoutAdaptation(wxDialog* dialog) else #endif // wxUSE_BOOKCTRL { +#if wxUSE_BUTTON // If we have an arbitrary dialog, create a scrolling area for the main content, and a button sizer // for the main buttons. wxScrolledWindow* scrolledWindow = CreateScrolledWindow(dialog); @@ -679,6 +680,7 @@ bool wxStandardDialogLayoutAdapter::DoLayoutAdaptation(wxDialog* dialog) scrolledWindow->SetSizer(oldSizer); FitWithScrolling(dialog, scrolledWindow); +#endif // wxUSE_BUTTON } } @@ -693,6 +695,8 @@ wxScrolledWindow* wxStandardDialogLayoutAdapter::CreateScrolledWindow(wxWindow* return scrolledWindow; } +#if wxUSE_BUTTON + /// Find and remove the button sizer, if any wxSizer* wxStandardDialogLayoutAdapter::FindButtonSizer(bool stdButtonSizer, wxDialog* dialog, wxSizer* sizer, int& retBorder, int accumlatedBorder) { @@ -790,6 +794,8 @@ bool wxStandardDialogLayoutAdapter::FindLooseButtons(wxDialog* dialog, wxStdDial return true; } +#endif // wxUSE_BUTTON + /// Reparent the controls to the scrolled window void wxStandardDialogLayoutAdapter::ReparentControls(wxWindow* parent, wxWindow* reparentTo, wxSizer* buttonSizer) {