X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c3ead1d1513a5eb79091a604f4e42b45d1bdf5d..8a31648287be0ef976f133de2786b137f1e98340:/src/ribbon/control.cpp diff --git a/src/ribbon/control.cpp b/src/ribbon/control.cpp index a963a6c4c1..d80449445e 100644 --- a/src/ribbon/control.cpp +++ b/src/ribbon/control.cpp @@ -8,16 +8,17 @@ // Copyright: (C) Peter Cawley // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// + #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif -#include "wx/ribbon/control.h" - #if wxUSE_RIBBON +#include "wx/ribbon/control.h" + #ifndef WX_PRECOMP #endif @@ -27,20 +28,22 @@ IMPLEMENT_CLASS(wxRibbonControl, wxControl) -wxRibbonControl::wxRibbonControl(wxWindow *parent, wxWindowID id, +bool wxRibbonControl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) - : wxControl(parent, id, pos, size, style, validator, name) { - m_art = NULL; + if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) + return false; wxRibbonControl *ribbon_parent = wxDynamicCast(parent, wxRibbonControl); if(ribbon_parent) { m_art = ribbon_parent->GetArtProvider(); } + + return true; } void wxRibbonControl::SetArtProvider(wxRibbonArtProvider* art)