Lots of updates for color dialog and sliders

[wxWidgets.git] / include / wx / msw / treectrl.h

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index b99a97724afaae67a8b78b84f2730f0fe07a3cdf..dd1deab918c4fe008024adc66f8ff52411fde213 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -439,7 +439,7 @@ private:
                              class wxTreeItemIndirectData *data);
     bool HasIndirectData(const wxTreeItemId& item) const;
     bool IsDataIndirect(wxTreeItemData *data) const
                              class wxTreeItemIndirectData *data);
     bool HasIndirectData(const wxTreeItemId& item) const;
     bool IsDataIndirect(wxTreeItemData *data) const

-        { return data->GetId().m_pItem == 0; }
+        { return data && data->GetId().m_pItem == 0; }

 
     // the hash storing the items attributes (indexed by items ids)
     wxHashTable m_attrs;
 
     // the hash storing the items attributes (indexed by items ids)
     wxHashTable m_attrs;


@@ -450,6 +450,9 @@ private:
     // used for dragging
     wxDragImage *m_dragImage;
 
     // used for dragging
     wxDragImage *m_dragImage;
 

+    // Virtual root item, if wxTR_HIDE_ROOT is set.
+    void* m_pVirtualRoot;
+

     // the starting item for selection with Shift
     WXHTREEITEM m_htSelStart;
 
     // the starting item for selection with Shift
     WXHTREEITEM m_htSelStart;