From b725fa9a8b9ae30dd514248d6a84644578c70df2 Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Sun, 8 Mar 2009 06:35:58 +0000 Subject: [PATCH] Mac inherits the window variant setting on control creation, and thus on Mac this always asserts, so remove the assert to fix #10559. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/choicbkg.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp index d3682635da..dc93e2b292 100644 --- a/src/generic/choicbkg.cpp +++ b/src/generic/choicbkg.cpp @@ -194,9 +194,9 @@ bool wxChoicebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId)) void wxChoicebook::DoSetWindowVariant(wxWindowVariant variant) { - wxCHECK_RET( m_bookctrl, "can't be called before control creation" ); - - m_bookctrl->SetWindowVariant(variant); + wxBookCtrlBase::DoSetWindowVariant(variant); + if (m_bookctrl) + m_bookctrl->SetWindowVariant(variant); } void wxChoicebook::SetImageList(wxImageList *imageList) -- 2.45.2