X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/502a2b1810943f9a446a16e73ef780321eb69a06..5fd588d2298a44428ac66bef1e4d9fc73e18d4fd:/include/wx/msw/treectrl.h

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index b99a97724a..68062889b5 100644
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -76,7 +76,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = "wxTreeCtrl")
+               const wxString& name = wxTreeCtrlNameStr)
     {
         Create(parent, id, pos, size, style, validator, name);
     }
@@ -88,7 +88,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = "wxTreeCtrl");
+                const wxString& name = wxTreeCtrlNameStr);
 
     // accessors
     // ---------
@@ -141,6 +141,15 @@ public:
         // get the data associated with the item
     wxTreeItemData *GetItemData(const wxTreeItemId& item) const;
 
+        // get the item's text colour
+    wxColour GetItemTextColour(const wxTreeItemId& item) const;
+
+        // get the item's background colour
+    wxColour GetItemBackgroundColour(const wxTreeItemId& item) const;
+
+        // get the item's font
+    wxFont GetItemFont(const wxTreeItemId& item) const;
+
     // modifiers
     // ---------
 
@@ -439,7 +448,7 @@ private:
                              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;
@@ -450,6 +459,9 @@ private:
     // 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;