If a TLW's default item is not an immediate child then it can be left

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

diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index c29bf85131cac42b2efa072b3ad0068bf5c80fba..b21319248af1c8f24cc9b5311e9696a893e56460 100644 (file)
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -166,14 +166,14 @@ int wxListbook::HitTest(const wxPoint& pt, long *flags) const
     int pagePos = wxNOT_FOUND;
 
     if ( flags )
     int pagePos = wxNOT_FOUND;
 
     if ( flags )

-        *flags = wxNB_HITTEST_NOWHERE;
+        *flags = wxBK_HITTEST_NOWHERE;

 
     // convert from listbook control coordinates to list control coordinates
     const wxListView * const list = GetListView();
     const wxPoint listPt = list->ScreenToClient(ClientToScreen(pt));
 
     // is the point inside list control?
 
     // convert from listbook control coordinates to list control coordinates
     const wxListView * const list = GetListView();
     const wxPoint listPt = list->ScreenToClient(ClientToScreen(pt));
 
     // is the point inside list control?

-    if ( wxRect(list->GetSize()).Inside(listPt) )
+    if ( wxRect(list->GetSize()).Contains(listPt) )

     {
         int flagsList;
         pagePos = list->HitTest(listPt, flagsList);
     {
         int flagsList;
         pagePos = list->HitTest(listPt, flagsList);


@@ -185,16 +185,16 @@ int wxListbook::HitTest(const wxPoint& pt, long *flags) const
 
             if ( flagsList & (wxLIST_HITTEST_ONITEMICON |
                               wxLIST_HITTEST_ONITEMSTATEICON ) )
 
             if ( flagsList & (wxLIST_HITTEST_ONITEMICON |
                               wxLIST_HITTEST_ONITEMSTATEICON ) )

-                *flags |= wxNB_HITTEST_ONICON;
+                *flags |= wxBK_HITTEST_ONICON;

 
             if ( flagsList & wxLIST_HITTEST_ONITEMLABEL )
 
             if ( flagsList & wxLIST_HITTEST_ONITEMLABEL )

-                *flags |= wxNB_HITTEST_ONLABEL;
+                *flags |= wxBK_HITTEST_ONLABEL;

         }
     }
     else // not over list control at all
     {
         }
     }
     else // not over list control at all
     {

-        if ( flags && GetPageRect().Inside(pt) )
-            *flags |= wxNB_HITTEST_ONPAGE;
+        if ( flags && GetPageRect().Contains(pt) )
+            *flags |= wxBK_HITTEST_ONPAGE;

     }
 
     return pagePos;
     }
 
     return pagePos;