relay out the control after deleting any page, not just the last one (#9684); also...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index 82a1220c32673e2406dc5c9d57885dff1fb094ce..487b6494a2b4f9f379faf8b9b489341966a7a043 100644 (file)
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -185,9 +185,11 @@ void wxListbook::OnSize(wxSizeEvent& event)
     // under MSW, we'd finish with an ugly looking list control with both
     // vertical and horizontal scrollbar (with one of them being added because
     // the other one is not accounted for in client size computations)
     // under MSW, we'd finish with an ugly looking list control with both
     // vertical and horizontal scrollbar (with one of them being added because
     // the other one is not accounted for in client size computations)

-    wxListView *list = GetListView();
-    if (list) list->Arrange();
-    wxBookCtrlBase::OnSize(event);
+    wxListView * const list = GetListView();
+    if ( list )
+        list->Arrange();
+
+    event.Skip();

 }
 
 int wxListbook::HitTest(const wxPoint& pt, long *flags) const
 }
 
 int wxListbook::HitTest(const wxPoint& pt, long *flags) const


@@ -247,6 +249,13 @@ wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const
     return size;
 }
 
     return size;
 }
 

+void wxListbook::UpdateSize()
+{
+    // we should find a more elegant way to force a layout than generating this
+    // dummy event
+    wxSizeEvent sz(GetSize(), GetId());
+    GetEventHandler()->ProcessEvent(sz);
+}

 
 // ----------------------------------------------------------------------------
 // accessing the pages
 
 // ----------------------------------------------------------------------------
 // accessing the pages


@@ -412,9 +421,8 @@ wxListbook::InsertPage(size_t n,
     if ( selNew != -1 )
         SetSelection(selNew);
 
     if ( selNew != -1 )
         SetSelection(selNew);
 

-    wxSizeEvent sz(GetSize(), GetId());
-    GetEventHandler()->ProcessEvent(sz);
-    
+    UpdateSize();
+

     return true;
 }
 
     return true;
 }
 


@@ -444,11 +452,7 @@ wxWindow *wxListbook::DoRemovePage(size_t page)
         }
 
         GetListView()->Arrange();
         }
 
         GetListView()->Arrange();

-        if (GetPageCount() == 0)
-        {
-            wxSizeEvent sz(GetSize(), GetId());
-            GetEventHandler()->ProcessEvent(sz);
-        }
+        UpdateSize();

     }
 
     return win;
     }
 
     return win;


@@ -463,8 +467,7 @@ bool wxListbook::DeleteAllPages()
 
     m_selection = -1;
 
 
     m_selection = -1;
 

-    wxSizeEvent sz(GetSize(), GetId());
-    GetEventHandler()->ProcessEvent(sz);
+    UpdateSize();

 
     return true;
 }
 
     return true;
 }