X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec09e18d3544bb333f367db7f7e8f410d81e5b14..78cd9c69eb3f4c158fe10ce49325d57ec05d1306:/src/common/bookctrl.cpp

diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index d1e7bcbe01..7f398c2738 100644
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -125,6 +125,18 @@ void wxBookCtrlBase::AssignImageList(wxImageList* imageList)
 // geometry
 // ----------------------------------------------------------------------------
 
+void wxBookCtrlBase::DoInvalidateBestSize()
+{
+    // notice that it is not necessary to invalidate our own best size
+    // explicitly if we have m_bookctrl as it will already invalidate the best
+    // size of its parent when its own size is invalidated and its parent is
+    // this control
+    if ( m_bookctrl )
+        m_bookctrl->InvalidateBestSize();
+    else
+        wxControl::InvalidateBestSize();
+}
+
 void wxBookCtrlBase::SetPageSize(const wxSize& size)
 {
     SetClientSize(CalcSizeFromPage(size));
@@ -161,6 +173,142 @@ wxSize wxBookCtrlBase::DoGetBestSize() const
     return best;
 }
 
+wxRect wxBookCtrlBase::GetPageRect() const
+{
+    const wxSize size = GetControllerSize();
+
+    wxPoint pt;
+    wxRect rectPage(pt, GetClientSize());
+
+    switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
+    {
+        default:
+            wxFAIL_MSG( _T("unexpected alignment") );
+            // fall through
+
+        case wxBK_TOP:
+            rectPage.y = size.y + GetInternalBorder();
+            // fall through
+
+        case wxBK_BOTTOM:
+            rectPage.height -= size.y + GetInternalBorder();
+            if (rectPage.height < 0)
+                rectPage.height = 0;
+            break;
+
+        case wxBK_LEFT:
+            rectPage.x = size.x + GetInternalBorder();
+            // fall through
+
+        case wxBK_RIGHT:
+            rectPage.width -= size.x + GetInternalBorder();
+            if (rectPage.width < 0)
+                rectPage.width = 0;
+            break;
+    }
+
+    return rectPage;
+}
+
+// Lay out controls
+void wxBookCtrlBase::DoSize()
+{
+    if ( !m_bookctrl )
+    {
+        // we're not fully created yet or OnSize() should be hidden by derived class
+        return;
+    }
+
+    if (GetSizer())
+        Layout();
+    else
+    {
+        // resize controller and the page area to fit inside our new size
+        const wxSize sizeClient( GetClientSize() ),
+                    sizeBorder( m_bookctrl->GetSize() - m_bookctrl->GetClientSize() ),
+                    sizeCtrl( GetControllerSize() );
+
+        m_bookctrl->SetClientSize( sizeCtrl.x - sizeBorder.x, sizeCtrl.y - sizeBorder.y );
+
+        const wxSize sizeNew = m_bookctrl->GetSize();
+        wxPoint posCtrl;
+        switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
+        {
+            default:
+                wxFAIL_MSG( _T("unexpected alignment") );
+                // fall through
+
+            case wxBK_TOP:
+            case wxBK_LEFT:
+                // posCtrl is already ok
+                break;
+
+            case wxBK_BOTTOM:
+                posCtrl.y = sizeClient.y - sizeNew.y;
+                break;
+
+            case wxBK_RIGHT:
+                posCtrl.x = sizeClient.x - sizeNew.x;
+                break;
+        }
+
+        if ( m_bookctrl->GetPosition() != posCtrl )
+            m_bookctrl->Move(posCtrl);
+    }
+
+    // resize all pages to fit the new control size
+    const wxRect pageRect = GetPageRect();
+    const unsigned pagesCount = m_pages.GetCount();
+    for ( unsigned int i = 0; i < pagesCount; ++i )
+    {
+        wxWindow * const page = m_pages[i];
+        if ( !page )
+        {
+            wxASSERT_MSG( AllowNullPage(),
+                _T("Null page in a control that does not allow null pages?") );
+            continue;
+        }
+
+        page->SetSize(pageRect);
+    }
+}
+
+void wxBookCtrlBase::OnSize(wxSizeEvent& event)
+{
+    event.Skip();
+
+    DoSize();
+}
+
+wxSize wxBookCtrlBase::GetControllerSize() const
+{
+    if(!m_bookctrl)
+        return wxSize(0,0);
+
+    const wxSize sizeClient = GetClientSize(),
+                 sizeBorder = m_bookctrl->GetSize() - m_bookctrl->GetClientSize(),
+                 sizeCtrl = m_bookctrl->GetBestSize() + sizeBorder;
+
+    wxSize size;
+
+    if ( IsVertical() )
+    {
+        size.x = sizeClient.x;
+        size.y = sizeCtrl.y;
+    }
+    else // left/right aligned
+    {
+        size.x = sizeCtrl.x;
+        size.y = sizeClient.y;
+    }
+
+    return size;
+}
+
+// ----------------------------------------------------------------------------
+// miscellaneous stuff
+// ----------------------------------------------------------------------------
+
 #if wxUSE_HELP
 
 void wxBookCtrlBase::OnHelp(wxHelpEvent& event)
@@ -172,7 +320,7 @@ void wxBookCtrlBase::OnHelp(wxHelpEvent& event)
     // if the event object == this because the book control can have other
     // subcontrols inside it (e.g. wxSpinButton in case of a notebook in wxUniv)
     wxWindow *source = wxStaticCast(event.GetEventObject(), wxWindow);
-    while ( source && source->GetParent() != this )
+    while ( source && source != this && source->GetParent() != this )
     {
         source = source->GetParent();
     }
@@ -239,7 +387,7 @@ wxBookCtrlBase::InsertPage(size_t nPage,
     if ( page )
         page->SetSize(GetPageRect());
 
-    InvalidateBestSize();
+    DoInvalidateBestSize();
 
     return true;
 }
@@ -263,7 +411,7 @@ wxWindow *wxBookCtrlBase::DoRemovePage(size_t nPage)
 
     wxWindow *pageRemoved = m_pages[nPage];
     m_pages.RemoveAt(nPage);
-    InvalidateBestSize();
+    DoInvalidateBestSize();
 
     return pageRemoved;
 }
@@ -291,132 +439,52 @@ int wxBookCtrlBase::GetNextPage(bool forward) const
     return nPage;
 }
 
-wxRect wxBookCtrlBase::GetPageRect() const
+int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
 {
-    const wxSize size = GetControllerSize();
-
-    wxPoint pt;
-    wxRect rectPage(pt, GetClientSize());
-
-    switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
-    {
-        default:
-            wxFAIL_MSG( _T("unexpected alignment") );
-            // fall through
-
-        case wxBK_TOP:
-            rectPage.y = size.y + GetInternalBorder();
-            // fall through
-
-        case wxBK_BOTTOM:
-            rectPage.height -= size.y + GetInternalBorder();
-            break;
-
-        case wxBK_LEFT:
-            rectPage.x = size.x + GetInternalBorder();
-            // fall through
-
-        case wxBK_RIGHT:
-            rectPage.width -= size.x + GetInternalBorder();
-            break;
-    }
+    wxCHECK_MSG( n < GetPageCount(), wxNOT_FOUND,
+                 wxT("invalid page index in wxBookCtrlBase::DoSetSelection()") );
 
-    return rectPage;
-}
+    const int oldSel = GetSelection();
 
-// Lay out controls
-void wxBookCtrlBase::DoSize()
-{
-    if ( !m_bookctrl )
+    if ( n != (size_t)oldSel )
     {
-        // we're not fully created yet or OnSize() should be hidden by derived class
-        return;
-    }
+        wxBookCtrlBaseEvent *event = CreatePageChangingEvent();
+        bool allowed = false;
 
-    if (GetSizer())
-        Layout();
-    else
-    {
-        // resize controller and the page area to fit inside our new size
-        const wxSize sizeClient( GetClientSize() ),
-                    sizeBorder( m_bookctrl->GetSize() - m_bookctrl->GetClientSize() ),
-                    sizeCtrl( GetControllerSize() );
-
-        m_bookctrl->SetClientSize( sizeCtrl.x - sizeBorder.x, sizeCtrl.y - sizeBorder.y );
-
-        const wxSize sizeNew = m_bookctrl->GetSize();
-        wxPoint posCtrl;
-        switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
+        if ( flags & SetSelection_SendEvent )
         {
-            default:
-                wxFAIL_MSG( _T("unexpected alignment") );
-                // fall through
-
-            case wxBK_TOP:
-            case wxBK_LEFT:
-                // posCtrl is already ok
-                break;
-
-            case wxBK_BOTTOM:
-                posCtrl.y = sizeClient.y - sizeNew.y;
-                break;
+            event->SetSelection(n);
+            event->SetOldSelection(oldSel);
+            event->SetEventObject(this);
 
-            case wxBK_RIGHT:
-                posCtrl.x = sizeClient.x - sizeNew.x;
-                break;
+            allowed = !GetEventHandler()->ProcessEvent(*event) || event->IsAllowed();
         }
 
-        if ( m_bookctrl->GetPosition() != posCtrl )
-            m_bookctrl->Move(posCtrl);
-    }
-
-    // resize all pages to fit the new control size
-    const wxRect pageRect = GetPageRect();
-    const unsigned pagesCount = m_pages.Count();
-    for ( unsigned int i = 0; i < pagesCount; ++i )
-    {
-        wxWindow * const page = m_pages[i];
-        if ( !page )
+        if ( !(flags & SetSelection_SendEvent) || allowed)
         {
-            wxASSERT_MSG( AllowNullPage(),
-                _T("Null page in a control that does not allow null pages?") );
-            continue;
-        }
+            if ( oldSel != wxNOT_FOUND )
+                m_pages[oldSel]->Hide();
 
-        page->SetSize(pageRect);
-    }
-}
+            wxWindow *page = m_pages[n];
+            page->SetSize(GetPageRect());
+            page->Show();
 
-void wxBookCtrlBase::OnSize(wxSizeEvent& event)
-{
-    event.Skip();
-
-    DoSize();
-}
-
-wxSize wxBookCtrlBase::GetControllerSize() const
-{
-    if(!m_bookctrl)
-        return wxSize(0,0);
-
-    const wxSize sizeClient = GetClientSize(),
-                 sizeBorder = m_bookctrl->GetSize() - m_bookctrl->GetClientSize(),
-                 sizeCtrl = m_bookctrl->GetBestSize() + sizeBorder;
+            // change selection now to ignore the selection change event
+            UpdateSelectedPage(n);
 
-    wxSize size;
+            if ( flags & SetSelection_SendEvent )
+            {
+                // program allows the page change
+                MakeChangedEvent(*event);
+                (void)GetEventHandler()->ProcessEvent(*event);
+            }
+        }
 
-    if ( IsVertical() )
-    {
-        size.x = sizeClient.x;
-        size.y = sizeCtrl.y;
-    }
-    else // left/right aligned
-    {
-        size.x = sizeCtrl.x;
-        size.y = sizeClient.y;
+        delete event;
     }
 
-    return size;
+    return oldSel;
 }
 
+
 #endif // wxUSE_BOOKCTRL