wxWinCE power build fixes.

[wxWidgets.git] / src / common / bookctrl.cpp

diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index b61570f183f9f619e8a924b2267db72bd60a639b..0d86e640080dfee71efd9e8690f47d5e6b936504 100644 (file)
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -42,6 +42,9 @@ IMPLEMENT_ABSTRACT_CLASS(wxBookCtrlBase, wxControl)
 
 BEGIN_EVENT_TABLE(wxBookCtrlBase, wxControl)
     EVT_SIZE(wxBookCtrlBase::OnSize)
+#if wxUSE_HELP
+    EVT_HELP(wxID_ANY, wxBookCtrlBase::OnHelp)
+#endif // wxUSE_HELP
 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
@@ -147,7 +150,7 @@ wxSize wxBookCtrlBase::DoGetBestSize() const
                 bestSize.y = childBestSize.y;
         }
     }
-    
+
     if (m_fitToCurrentPage && GetCurrentPage())
         bestSize = GetCurrentPage()->GetBestSize();
 
@@ -158,6 +161,35 @@ wxSize wxBookCtrlBase::DoGetBestSize() const
     return best;
 }
 
+#if wxUSE_HELP
+void wxBookCtrlBase::OnHelp(wxHelpEvent& event)
+{
+    // find the corresponding page
+    wxWindow *page = NULL;
+
+    if ( event.GetOrigin() == wxHelpEvent::Origin_HelpButton )
+    {
+        // show help for the page under the mouse
+        const int pagePos = HitTest(ScreenToClient(event.GetPosition()));
+
+        if ( pagePos != wxNOT_FOUND)
+        {
+            page = GetPage((size_t)pagePos);
+        }
+    }
+
+    if ( !page )
+    {
+        page = GetCurrentPage();
+    }
+
+    if ( !page || !page->GetEventHandler()->ProcessEvent(event) )
+    {
+        event.Skip();
+    }
+}
+#endif // wxUSE_HELP
+
 // ----------------------------------------------------------------------------
 // pages management
 // ----------------------------------------------------------------------------
@@ -175,6 +207,9 @@ wxBookCtrlBase::InsertPage(size_t nPage,
                  _T("invalid page index in wxBookCtrlBase::InsertPage()") );
 
     m_pages.Insert(page, nPage);
+    if ( page )
+        page->SetSize(GetPageRect());
+
     InvalidateBestSize();
 
     return true;
@@ -267,7 +302,7 @@ void wxBookCtrlBase::DoSize()
         // we're not fully created yet or OnSize() should be hidden by derived class
         return;
     }
-    
+
     if (GetSizer())
         Layout();
     else
@@ -305,19 +340,27 @@ void wxBookCtrlBase::DoSize()
             m_bookctrl->Move(posCtrl);
     }
 
-    // resize the currently shown page
-    if (GetSelection() != wxNOT_FOUND )
+    // 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 *page = m_pages[GetSelection()];
-        wxCHECK_RET( page, _T("NULL page?") );
-        page->SetSize(GetPageRect());
+        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();
 }