don't crash when destroying a not initialized socket (patch 1489095)

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

diff --git a/src/generic/treebkg.cpp b/src/generic/treebkg.cpp
index 5f86245e7e90061b73a3354c4f3af6b003aafe93..57593a5bb1a778fc21822932ecca2d6d7ac4abe5 100644 (file)
--- a/src/generic/treebkg.cpp
+++ b/src/generic/treebkg.cpp
@@ -27,8 +27,12 @@
 #if wxUSE_TREEBOOK
 
 #include "wx/treebook.h"
 #if wxUSE_TREEBOOK
 
 #include "wx/treebook.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/settings.h"
+#endif
+

 #include "wx/imaglist.h"
 #include "wx/imaglist.h"

-#include "wx/settings.h"

 
 // ----------------------------------------------------------------------------
 // various wxWidgets macros
 
 // ----------------------------------------------------------------------------
 // various wxWidgets macros


@@ -100,11 +104,14 @@ wxTreebook::Create(wxWindow *parent,
                     wxID_TREEBOOKTREEVIEW,
                     wxDefaultPosition,
                     wxDefaultSize,
                     wxID_TREEBOOKTREEVIEW,
                     wxDefaultPosition,
                     wxDefaultSize,

-                    wxBORDER_SIMPLE |
+#ifndef __WXMSW__
+                    wxBORDER_SIMPLE | // On wxMSW this produces a black border which is wrong
+#endif

                     wxTR_DEFAULT_STYLE |
                     wxTR_HIDE_ROOT |
                     wxTR_SINGLE
                  );
                     wxTR_DEFAULT_STYLE |
                     wxTR_HIDE_ROOT |
                     wxTR_SINGLE
                  );

+    GetTreeCtrl()->SetQuickBestSize(false); // do full size calculation

     GetTreeCtrl()->AddRoot(wxEmptyString); // label doesn't matter, it's hidden
 
 #ifdef __WXMSW__
     GetTreeCtrl()->AddRoot(wxEmptyString); // label doesn't matter, it's hidden
 
 #ifdef __WXMSW__


@@ -203,8 +210,6 @@ bool wxTreebook::DoInsertPage(size_t pagePos,
 
     DoUpdateSelection(bSelect, pagePos);
 
 
     DoUpdateSelection(bSelect, pagePos);
 

-    m_bookctrl->InvalidateBestSize();
-

     return true;
 }
 
     return true;
 }
 


@@ -246,6 +251,8 @@ bool wxTreebook::DoInsertSubPage(size_t pagePos,
 
     wxTreeItemId newId = tree->AppendItem(parentId, text, imageId);
 
 
     wxTreeItemId newId = tree->AppendItem(parentId, text, imageId);
 

+    tree->InvalidateBestSize();
+

     if ( !newId.IsOk() )
     {
         (void)wxBookCtrlBase::DoRemovePage(newPos);
     if ( !newId.IsOk() )
     {
         (void)wxBookCtrlBase::DoRemovePage(newPos);


@@ -258,8 +265,6 @@ bool wxTreebook::DoInsertSubPage(size_t pagePos,
 
     DoUpdateSelection(bSelect, newPos);
 
 
     DoUpdateSelection(bSelect, newPos);
 

-    m_bookctrl->InvalidateBestSize();
-

     return true;
 }
 
     return true;
 }
 


@@ -308,7 +313,6 @@ wxTreebookPage *wxTreebook::DoRemovePage(size_t pagePos)
 
     tree->DeleteChildren( pageId );
     tree->Delete( pageId );
 
     tree->DeleteChildren( pageId );
     tree->Delete( pageId );

-    tree->InvalidateBestSize();

 
     return oldPage;
 }
 
     return oldPage;
 }


@@ -629,10 +633,7 @@ int wxTreebook::DoSetSelection(size_t pagePos)
         }
 
         if ( page )
         }
 
         if ( page )

-        {
-            page->SetSize(GetPageRect());

             page->Show();
             page->Show();

-        }

 
         tree->SelectItem(DoInternalGetPage(pagePos));
 
 
         tree->SelectItem(DoInternalGetPage(pagePos));
 


@@ -649,6 +650,20 @@ int wxTreebook::DoSetSelection(size_t pagePos)
     return oldSel;
 }
 
     return oldSel;
 }
 

+wxTreebookPage *wxTreebook::DoGetCurrentPage() const
+{
+    if ( m_selection == wxNOT_FOUND )
+        return NULL;
+
+    wxTreebookPage *page = wxBookCtrlBase::GetPage(m_selection);
+    if ( !page && m_actualSelection != wxNOT_FOUND )
+    {
+        page = wxBookCtrlBase::GetPage(m_actualSelection);
+    }
+
+    return page;
+}
+

 void wxTreebook::SetImageList(wxImageList *imageList)
 {
     wxBookCtrlBase::SetImageList(imageList);
 void wxTreebook::SetImageList(wxImageList *imageList)
 {
     wxBookCtrlBase::SetImageList(imageList);


@@ -708,18 +723,25 @@ void wxTreebook::OnTreeNodeExpandedCollapsed(wxTreeEvent & event)
 // wxTreebook geometry management
 // ----------------------------------------------------------------------------
 
 // wxTreebook geometry management
 // ----------------------------------------------------------------------------
 

-wxTreebookPage * wxTreebook::DoGetCurrentPage() const
+int wxTreebook::HitTest(wxPoint const & pt, long * WXUNUSED(flags)) const

 {
 {

-    if ( m_selection == wxNOT_FOUND )
-        return NULL;
+    int pagePos = wxNOT_FOUND;

 
 

-    wxTreebookPage *page = wxBookCtrlBase::GetPage(m_selection);
-    if ( !page && m_actualSelection != wxNOT_FOUND )
+    wxTreeCtrl * const tree = GetTreeCtrl();
+    const wxPoint treePt = ClientToScreen(tree->ScreenToClient(pt));
+
+    if ( wxRect(tree->GetSize()).Inside(treePt) )

     {
     {

-        page = wxBookCtrlBase::GetPage(m_actualSelection);
+        int flagsTree;
+        wxTreeItemId id = tree->HitTest(treePt, flagsTree);
+
+        if ( id.IsOk() && (flagsTree & wxTREE_HITTEST_ONITEM) )
+        {
+            pagePos = DoInternalFindPageById(id);
+        }

     }
 
     }
 

-    return page;
+    return pagePos;

 }
 
 #endif // wxUSE_TREEBOOK
 }
 
 #endif // wxUSE_TREEBOOK