Avoid an assert if no alignment style is specified

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

diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index f7f480980c6fa9cda29cf8864c74e6cec3c9ee2d..f096095e55bf12a50678e141068955c94ac1b8f5 100644 (file)
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -26,11 +26,15 @@
 
 #if wxUSE_LISTBOOK
 
+#include "wx/listbook.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/settings.h"
+#endif
+
 #include "wx/listctrl.h"
 #include "wx/statline.h"
-#include "wx/listbook.h"
 #include "wx/imaglist.h"
-#include "wx/settings.h"
 
 // ----------------------------------------------------------------------------
 // various wxWidgets macros
@@ -157,6 +161,26 @@ void wxListbook::OnSize(wxSizeEvent& event)
     wxBookCtrlBase::OnSize(event);
 }
 
+int wxListbook::HitTest(const wxPoint& pt, long * WXUNUSED(flags)) const
+{
+    int pagePos = wxNOT_FOUND;
+
+    const wxPoint clientPt = ClientToScreen(GetListView()->ScreenToClient(pt));
+
+    if ( wxRect(GetListView()->GetSize()).Inside(clientPt) )
+    {
+        int flagsList;
+        pagePos = GetListView()->HitTest(clientPt, flagsList);
+
+        if ( !(flagsList & wxLIST_HITTEST_ONITEM) )
+        {
+            pagePos = wxNOT_FOUND;
+        }
+    }
+
+    return pagePos;
+}
+
 wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const
 {
     // we need to add the size of the list control and the border between
@@ -303,7 +327,7 @@ wxListbook::InsertPage(size_t n,
     InvalidateBestSize();
     // GetListView()->InvalidateBestSize();
     GetListView()->Arrange();
-    
+
     if (GetPageCount() == 1)
     {
         wxSizeEvent sz(GetSize(), GetId());
@@ -354,12 +378,12 @@ bool wxListbook::DeleteAllPages()
     GetListView()->DeleteAllItems();
     if (!wxBookCtrlBase::DeleteAllPages())
         return false;
-    
+
     m_selection = -1;
 
     wxSizeEvent sz(GetSize(), GetId());
     ProcessEvent(sz);
-    
+
     return true;
 }