X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/960615f41009ac62e99f833afbec10d96bd2d2f9..c13d6ac1ea199d1e3908d40d129e2fd5a4d82df7:/src/ribbon/page.cpp

diff --git a/src/ribbon/page.cpp b/src/ribbon/page.cpp
index fcca24e37b..3448462420 100644
--- a/src/ribbon/page.cpp
+++ b/src/ribbon/page.cpp
@@ -14,10 +14,9 @@
     #pragma hdrstop
 #endif
 
-#include "wx/ribbon/page.h"
-
 #if wxUSE_RIBBON
 
+#include "wx/ribbon/page.h"
 #include "wx/ribbon/art.h"
 #include "wx/ribbon/bar.h"
 #include "wx/dcbuffer.h"
@@ -374,6 +373,8 @@ void wxRibbonPage::SetSizeWithScrollButtonAdjustment(int x, int y, int width, in
             }
         }
     }
+    if (width < 0) width = 0;
+    if (height < 0) height = 0;
     SetSize(x, y, width, height);
 }
 
@@ -414,9 +415,12 @@ void wxRibbonPage::OnSize(wxSizeEvent& evt)
 {
     wxSize new_size = evt.GetSize();
 
-    wxMemoryDC temp_dc;
-    wxRect invalid_rect = m_art->GetPageBackgroundRedrawArea(temp_dc, this, m_old_size, new_size);
-    Refresh(true, &invalid_rect);
+    if (m_art)
+    {
+        wxMemoryDC temp_dc;
+        wxRect invalid_rect = m_art->GetPageBackgroundRedrawArea(temp_dc, this, m_old_size, new_size);
+        Refresh(true, &invalid_rect);
+    }
 
     m_old_size = new_size;
 
@@ -539,6 +543,7 @@ bool wxRibbonPage::DoActualLayout()
         minor_axis_size = GetSize().GetWidth() - origin.x - m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_RIGHT_SIZE);
         available_space = m_size_in_major_axis_for_children - m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_BOTTOM_SIZE) - origin.y;
     }
+    if (minor_axis_size < 0) minor_axis_size = 0;
     size_t size_index;
     for(size_index = 0; size_index < m_size_calc_array_size; ++size_index)
     {