Disable wxUSE_ENH_METAFILE for wxGTK builds.

[wxWidgets.git] / src / generic / toolbkg.cpp

diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp
index 1fe2ad781d4b0964a55ac2f39b80ee7211684daa..f324ea96db78409a4561b72130a336c0b7b9340c 100644 (file)
--- a/src/generic/toolbkg.cpp
+++ b/src/generic/toolbkg.cpp
@@ -333,28 +333,13 @@ bool wxToolbook::InsertPage(size_t n,
 
 wxWindow *wxToolbook::DoRemovePage(size_t page)
 {
 
 wxWindow *wxToolbook::DoRemovePage(size_t page)
 {

-    const size_t page_count = GetPageCount();

     wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
 
     if ( win )
     {
         GetToolBar()->DeleteTool(page + 1);
 
     wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
 
     if ( win )
     {
         GetToolBar()->DeleteTool(page + 1);
 

-        if (m_selection >= (int)page)
-        {
-            // force new sel valid if possible
-            int sel = m_selection - 1;
-            if (page_count == 1)
-                sel = wxNOT_FOUND;
-            else if ((page_count == 2) || (sel == wxNOT_FOUND))
-                sel = 0;
-
-            // force sel invalid if deleting current page - don't try to hide it
-            m_selection = (m_selection == (int)page) ? wxNOT_FOUND : m_selection - 1;
-
-            if ((sel != wxNOT_FOUND) && (sel != m_selection))
-                SetSelection(sel);
-        }
+        DoSetSelectionAfterRemoval(page);

     }
 
     return win;
     }
 
     return win;