Add default constructor to wxGraphicsGradientStop.

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

diff --git a/src/ribbon/buttonbar.cpp b/src/ribbon/buttonbar.cpp
index 3de8011a5c4c20a4b1f6ce155a31caa3641835f3..3262c3b257d5ab157b2e74161764db6fc9afe5ad 100644 (file)
--- a/src/ribbon/buttonbar.cpp
+++ b/src/ribbon/buttonbar.cpp
@@ -15,10 +15,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/ribbon/buttonbar.h"
-

 #if wxUSE_RIBBON
 
 #if wxUSE_RIBBON
 

+#include "wx/ribbon/buttonbar.h"

 #include "wx/ribbon/art.h"
 #include "wx/dcbuffer.h"
 
 #include "wx/ribbon/art.h"
 #include "wx/dcbuffer.h"
 


@@ -125,7 +124,7 @@ public:
 
 WX_DECLARE_OBJARRAY(wxRibbonButtonBarButtonInstance, wxArrayRibbonButtonBarButtonInstance);
 #include "wx/arrimpl.cpp"
 
 WX_DECLARE_OBJARRAY(wxRibbonButtonBarButtonInstance, wxArrayRibbonButtonBarButtonInstance);
 #include "wx/arrimpl.cpp"

-WX_DEFINE_OBJARRAY(wxArrayRibbonButtonBarButtonInstance);
+WX_DEFINE_OBJARRAY(wxArrayRibbonButtonBarButtonInstance)

 
 class wxRibbonButtonBarLayout
 {
 
 class wxRibbonButtonBarLayout
 {


@@ -627,7 +626,7 @@ void wxRibbonButtonBar::CommonInit(long WXUNUSED(style))
     m_lock_active_state = false;
 
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
     m_lock_active_state = false;
 
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);

-};
+}

 
 wxSize wxRibbonButtonBar::GetMinSize() const
 {
 
 wxSize wxRibbonButtonBar::GetMinSize() const
 {


@@ -787,7 +786,7 @@ bool wxRibbonButtonBar::TryCollapseLayout(wxRibbonButtonBarLayout* original,
         layout->overall_size.GetHeight() > original->overall_size.GetHeight())
     {
         delete layout;
         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;
     }
 
         return false;
     }