X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb5bc9b7e2287adf5dd8e92ec72371821f588546..edba2de33ede5bbef0726e889d89fea2732d592d:/src/common/bookctrl.cpp?ds=sidebyside

diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index c0b1eedd9c..fef420180a 100644
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -310,6 +310,8 @@ wxRect wxBookCtrlBase::GetPageRect() const
 
         case wxBK_BOTTOM:
             rectPage.height -= size.y + GetInternalBorder();
+            if (rectPage.height < 0)
+                rectPage.height = 0;
             break;
 
         case wxBK_LEFT:
@@ -318,6 +320,8 @@ wxRect wxBookCtrlBase::GetPageRect() const
 
         case wxBK_RIGHT:
             rectPage.width -= size.x + GetInternalBorder();
+            if (rectPage.width < 0)
+                rectPage.width = 0;
             break;
     }
 
@@ -419,4 +423,52 @@ wxSize wxBookCtrlBase::GetControllerSize() const
     return size;
 }
 
+int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
+{
+    wxCHECK_MSG( n < GetPageCount(), wxNOT_FOUND,
+                 wxT("invalid page index in wxBookCtrlBase::DoSetSelection()") );
+
+    const int oldSel = GetSelection();
+
+    if ( n != (size_t)oldSel )
+    {
+        wxBookCtrlBaseEvent *event = CreatePageChangingEvent();
+        bool allowed = false;
+
+        if ( flags & SetSelection_SendEvent )
+        {
+            event->SetSelection(n);
+            event->SetOldSelection(oldSel);
+            event->SetEventObject(this);
+
+            allowed = !GetEventHandler()->ProcessEvent(*event) || event->IsAllowed();
+        }
+
+        if ( !(flags & SetSelection_SendEvent) || allowed)
+        {
+            if ( oldSel != wxNOT_FOUND )
+                m_pages[oldSel]->Hide();
+
+            wxWindow *page = m_pages[n];
+            page->SetSize(GetPageRect());
+            page->Show();
+
+            // change selection now to ignore the selection change event
+            UpdateSelectedPage(n);
+
+            if ( flags & SetSelection_SendEvent )
+            {
+                // program allows the page change
+                MakeChangedEvent(*event);
+                (void)GetEventHandler()->ProcessEvent(*event);
+            }
+        }
+
+        delete event;
+    }
+
+    return oldSel;
+}
+
+
 #endif // wxUSE_BOOKCTRL