More bakfile changes needed for bmpcbox. Rebaked.

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

diff --git a/src/generic/treebkg.cpp b/src/generic/treebkg.cpp
index 87280396482e2c8f989763485732f8533a5f5f41..2bcb1da8dd2e683d1bc44468a26a39f34788456c 100644 (file)
--- a/src/generic/treebkg.cpp
+++ b/src/generic/treebkg.cpp
@@ -651,7 +651,8 @@ int wxTreebook::DoSetSelection(size_t pagePos)
     else // page change vetoed
     {
         // tree selection might have already had changed
-        tree->SelectItem(DoInternalGetPage(oldSel));
+        if ( oldSel != wxNOT_FOUND )
+            tree->SelectItem(DoInternalGetPage(oldSel));
     }
 
     return oldSel;
@@ -742,7 +743,7 @@ int wxTreebook::HitTest(wxPoint const & pt, long * flags) const
     const wxPoint treePt = tree->ScreenToClient(ClientToScreen(pt));
 
     // is it over the tree?
-    if ( wxRect(tree->GetSize()).Inside(treePt) )
+    if ( wxRect(tree->GetSize()).Contains(treePt) )
     {
         int flagsTree;
         wxTreeItemId id = tree->HitTest(treePt, flagsTree);
@@ -768,7 +769,7 @@ int wxTreebook::HitTest(wxPoint const & pt, long * flags) const
     }
     else // not over the tree
     {
-        if ( flags && GetPageRect().Inside( pt ) )
+        if ( flags && GetPageRect().Contains( pt ) )
             *flags |= wxBK_HITTEST_ONPAGE;
     }