X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/143712733086515ee6ed40bbd9b7f11ce7f9d2e8..62f6be4448a1a8ba6b3ddc920df7c0957b7b1f31:/src/ribbon/buttonbar.cpp diff --git a/src/ribbon/buttonbar.cpp b/src/ribbon/buttonbar.cpp index 3de8011a5c..cfc8fe0931 100644 --- a/src/ribbon/buttonbar.cpp +++ b/src/ribbon/buttonbar.cpp @@ -125,7 +125,7 @@ public: WX_DECLARE_OBJARRAY(wxRibbonButtonBarButtonInstance, wxArrayRibbonButtonBarButtonInstance); #include "wx/arrimpl.cpp" -WX_DEFINE_OBJARRAY(wxArrayRibbonButtonBarButtonInstance); +WX_DEFINE_OBJARRAY(wxArrayRibbonButtonBarButtonInstance) class wxRibbonButtonBarLayout { @@ -627,7 +627,7 @@ void wxRibbonButtonBar::CommonInit(long WXUNUSED(style)) m_lock_active_state = false; SetBackgroundStyle(wxBG_STYLE_CUSTOM); -}; +} wxSize wxRibbonButtonBar::GetMinSize() const { @@ -787,7 +787,7 @@ bool wxRibbonButtonBar::TryCollapseLayout(wxRibbonButtonBarLayout* original, layout->overall_size.GetHeight() > original->overall_size.GetHeight()) { delete layout; - wxASSERT_MSG(false, wxT("Layout collapse resulted in increased size")); + wxFAIL_MSG("Layout collapse resulted in increased size"); return false; }