X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b11752c4f9e1fd4b11ba3d184246267facb3ad3..07890fbeb5e65f242e8632ed957c54e188779af2:/src/generic/choicbkg.cpp?ds=inline

diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp
index d3682635da..c21023c25b 100644
--- a/src/generic/choicbkg.cpp
+++ b/src/generic/choicbkg.cpp
@@ -176,14 +176,14 @@ wxString wxChoicebook::GetPageText(size_t n) const
 
 int wxChoicebook::GetPageImage(size_t WXUNUSED(n)) const
 {
-    wxFAIL_MSG( _T("wxChoicebook::GetPageImage() not implemented") );
+    wxFAIL_MSG( wxT("wxChoicebook::GetPageImage() not implemented") );
 
     return wxNOT_FOUND;
 }
 
 bool wxChoicebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId))
 {
-    wxFAIL_MSG( _T("wxChoicebook::SetPageImage() not implemented") );
+    wxFAIL_MSG( wxT("wxChoicebook::SetPageImage() not implemented") );
 
     return false;
 }
@@ -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)