Renamed wxDataViewCell to wxDataViewRenderer since the

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

diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index 16e4cf3e9a754a91f1bf3db347f6fbb379a1df0d..ffae3d708da7c67332915c8397b6fb52c422a9ff 100644 (file)
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -162,41 +162,61 @@ wxSize wxBookCtrlBase::DoGetBestSize() const
 }
 
 #if wxUSE_HELP
 }
 
 #if wxUSE_HELP

+

 void wxBookCtrlBase::OnHelp(wxHelpEvent& event)
 {
 void wxBookCtrlBase::OnHelp(wxHelpEvent& event)
 {

-    // ignore the events not coming from the book control itself, otherwise we
-    // could attempt to redirect a help event generated by one of our pages
-    // back to the same page resulting in an infinite loop
-    if ( event.GetEventObject() != this )
+    // determine where does this even originate from to avoid redirecting it
+    // back to the page which generated it (resulting in an infinite loop)
+
+    // notice that we have to check in the hard(er) way instead of just testing
+    // 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 != this && source->GetParent() != this )

     {
     {

-        event.Skip();
-        return;
+        source = source->GetParent();

     }
 
     }
 

-    // find the corresponding page
-    wxWindow *page = NULL;
-
-    if ( event.GetOrigin() == wxHelpEvent::Origin_HelpButton )
+    if ( source && m_pages.Index(source) == wxNOT_FOUND )

     {
     {

-        // show help for the page under the mouse
-        const int pagePos = HitTest(ScreenToClient(event.GetPosition()));
+        // this event is for the book control itself, redirect it to the
+        // corresponding page
+        wxWindow *page = NULL;

 
 

-        if ( pagePos != wxNOT_FOUND)
+        if ( event.GetOrigin() == wxHelpEvent::Origin_HelpButton )

         {
         {

-            page = GetPage((size_t)pagePos);
+            // show help for the page under the mouse
+            const int pagePos = HitTest(ScreenToClient(event.GetPosition()));
+
+            if ( pagePos != wxNOT_FOUND)
+            {
+                page = GetPage((size_t)pagePos);
+            }
+        }
+        else // event from keyboard or unknown source
+        {
+            // otherwise show the current page help
+            page = GetCurrentPage();

         }
         }

-    }

 
 

-    if ( !page )
-    {
-        page = GetCurrentPage();
+        if ( page )
+        {
+            // change event object to the page to avoid infinite recursion if
+            // we get this event ourselves if the page doesn't handle it
+            event.SetEventObject(page);
+
+            if ( page->GetEventHandler()->ProcessEvent(event) )
+            {
+                // don't call event.Skip()
+                return;
+            }
+        }

     }
     }

+    //else: event coming from one of our pages already

 
 

-    if ( !page || !page->GetEventHandler()->ProcessEvent(event) )
-    {
-        event.Skip();
-    }
+    event.Skip();

 }
 }

+

 #endif // wxUSE_HELP
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_HELP
 
 // ----------------------------------------------------------------------------


@@ -290,6 +310,8 @@ wxRect wxBookCtrlBase::GetPageRect() const
 
         case wxBK_BOTTOM:
             rectPage.height -= size.y + GetInternalBorder();
 
         case wxBK_BOTTOM:
             rectPage.height -= size.y + GetInternalBorder();

+            if (rectPage.height < 0)
+                rectPage.height = 0;

             break;
 
         case wxBK_LEFT:
             break;
 
         case wxBK_LEFT:


@@ -298,6 +320,8 @@ wxRect wxBookCtrlBase::GetPageRect() const
 
         case wxBK_RIGHT:
             rectPage.width -= size.x + GetInternalBorder();
 
         case wxBK_RIGHT:
             rectPage.width -= size.x + GetInternalBorder();

+            if (rectPage.width < 0)
+                rectPage.width = 0;

             break;
     }
 
             break;
     }