Fixed crash caused by A=B?C:D used for returning wxObject derived type.

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

diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index 67059a7197843378ab5854a0b3f3982008b1905c..b21319248af1c8f24cc9b5311e9696a893e56460 100644 (file)
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -173,7 +173,7 @@ int wxListbook::HitTest(const wxPoint& pt, long *flags) const
     const wxPoint listPt = list->ScreenToClient(ClientToScreen(pt));
 
     // is the point inside list control?
     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);


@@ -193,7 +193,7 @@ int wxListbook::HitTest(const wxPoint& pt, long *flags) const
     }
     else // not over list control at all
     {
     }
     else // not over list control at all
     {

-        if ( flags && GetPageRect().Inside(pt) )
+        if ( flags && GetPageRect().Contains(pt) )

             *flags |= wxBK_HITTEST_ONPAGE;
     }
 
             *flags |= wxBK_HITTEST_ONPAGE;
     }