Disable some wxWebView tests that fail on the buildbot but not locally.

[wxWidgets.git] / src / ribbon / control.cpp

diff --git a/src/ribbon/control.cpp b/src/ribbon/control.cpp
index a963a6c4c16c9fde4c91deb704cf9c7868409033..d80449445e475324f2a7f75f83998cbf3b9bfa77 100644 (file)
--- 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)