Added PrependColumn methods and short cuts. Added test for DeleteColumn to sample

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

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index dd2782f4cad9ac6b08285f6527e2f5e3c8896fbb..a8693594b32175edd2e366bad2103c7ecc857031 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -12,11 +12,19 @@
 #ifndef _WX_TREECTRL_H_BASE_
 #define _WX_TREECTRL_H_BASE_
 
 #ifndef _WX_TREECTRL_H_BASE_
 #define _WX_TREECTRL_H_BASE_
 

+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/defs.h"
+
+#if wxUSE_TREECTRL
+

 #include "wx/control.h"
 #include "wx/treebase.h"
 #include "wx/textctrl.h" // wxTextCtrl::ms_classinfo used through CLASSINFO macro
 
 #include "wx/control.h"
 #include "wx/treebase.h"
 #include "wx/textctrl.h" // wxTextCtrl::ms_classinfo used through CLASSINFO macro
 

-class WXDLLEXPORT wxImageList;
+class WXDLLIMPEXP_FWD_CORE wxImageList;

 
 // ----------------------------------------------------------------------------
 // wxTreeCtrlBase
 
 // ----------------------------------------------------------------------------
 // wxTreeCtrlBase


@@ -34,6 +42,9 @@ public:
 
         // arbitrary default
         m_spacing = 18;
 
         // arbitrary default
         m_spacing = 18;

+
+        // quick DoGetBestSize calculation
+        m_quickBestSize = true;

     }
 
     virtual ~wxTreeCtrlBase();
     }
 
     virtual ~wxTreeCtrlBase();


@@ -42,7 +53,7 @@ public:
     // ---------
 
         // get the total number of items in the control
     // ---------
 
         // get the total number of items in the control

-    virtual size_t GetCount() const = 0;
+    virtual unsigned int GetCount() const = 0;

 
         // indent is the number of pixels the children are indented relative to
         // the parents position. SetIndent() also redraws the control
 
         // indent is the number of pixels the children are indented relative to
         // the parents position. SetIndent() also redraws the control


@@ -112,7 +123,7 @@ public:
 
         // set items label
     virtual void SetItemText(const wxTreeItemId& item, const wxString& text) = 0;
 
         // set items label
     virtual void SetItemText(const wxTreeItemId& item, const wxString& text) = 0;

-        // get one of the images associated with the item (normal by default)
+        // set one of the images associated with the item (normal by default)

     virtual void SetItemImage(const wxTreeItemId& item,
                               int image,
                               wxTreeItemIcon which = wxTreeItemIcon_Normal) = 0;
     virtual void SetItemImage(const wxTreeItemId& item,
                               int image,
                               wxTreeItemIcon which = wxTreeItemIcon_Normal) = 0;


@@ -161,6 +172,9 @@ public:
     virtual bool IsSelected(const wxTreeItemId& item) const = 0;
         // is item text in bold font?
     virtual bool IsBold(const wxTreeItemId& item) const = 0;
     virtual bool IsSelected(const wxTreeItemId& item) const = 0;
         // is item text in bold font?
     virtual bool IsBold(const wxTreeItemId& item) const = 0;

+        // is the control empty?
+    bool IsEmpty() const;
+

 
     // number of children
     // ------------------
 
     // number of children
     // ------------------


@@ -276,8 +290,16 @@ public:
 
         // expand this item
     virtual void Expand(const wxTreeItemId& item) = 0;
 
         // expand this item
     virtual void Expand(const wxTreeItemId& item) = 0;

+        // expand the item and all its children recursively
+    void ExpandAllChildren(const wxTreeItemId& item);
+        // expand all items
+    void ExpandAll();

         // collapse the item without removing its children
     virtual void Collapse(const wxTreeItemId& item) = 0;
         // collapse the item without removing its children
     virtual void Collapse(const wxTreeItemId& item) = 0;

+        // collapse the item and all its children
+    void CollapseAllChildren(const wxTreeItemId& item);
+        // collapse all items
+    void CollapseAll();

         // collapse the item and remove all children
     virtual void CollapseAndReset(const wxTreeItemId& item) = 0;
         // toggles the current state
         // collapse the item and remove all children
     virtual void CollapseAndReset(const wxTreeItemId& item) = 0;
         // toggles the current state


@@ -342,10 +364,10 @@ public:
         // coordinates specified are relative to the client area of tree ctrl)
         // and, in the second variant, fill the flags parameter with a bitmask
         // of wxTREE_HITTEST_xxx constants.
         // coordinates specified are relative to the client area of tree ctrl)
         // and, in the second variant, fill the flags parameter with a bitmask
         // of wxTREE_HITTEST_xxx constants.

-    wxTreeItemId HitTest(const wxPoint& point)
-        { int dummy; return DoHitTest(point, dummy); }
-    wxTreeItemId HitTest(const wxPoint& point, int& flags)
-        { return DoHitTest(point, flags); }
+    wxTreeItemId HitTest(const wxPoint& point) const
+        { int dummy; return DoTreeHitTest(point, dummy); }
+    wxTreeItemId HitTest(const wxPoint& point, int& flags) const
+        { return DoTreeHitTest(point, flags); }

 
         // get the bounding rectangle of the item (or of its label only)
     virtual bool GetBoundingRect(const wxTreeItemId& item,
 
         // get the bounding rectangle of the item (or of its label only)
     virtual bool GetBoundingRect(const wxTreeItemId& item,


@@ -358,6 +380,10 @@ public:
 
     virtual bool ShouldInheritColours() const { return false; }
 
 
     virtual bool ShouldInheritColours() const { return false; }
 

+    // hint whether to calculate best size quickly or accurately
+    void SetQuickBestSize(bool q) { m_quickBestSize = q; }
+    bool GetQuickBestSize() const { return m_quickBestSize; }
+

 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;
 


@@ -382,7 +408,9 @@ protected:
 
     // real HitTest() implementation: again, can't be called just HitTest()
     // because it's overloaded and so the non-virtual overload would be hidden
 
     // real HitTest() implementation: again, can't be called just HitTest()
     // because it's overloaded and so the non-virtual overload would be hidden

-    virtual wxTreeItemId DoHitTest(const wxPoint& point, int& flags) = 0;
+    // (and can't be called DoHitTest() because this is already in wxWindow)
+    virtual wxTreeItemId DoTreeHitTest(const wxPoint& point,
+                                        int& flags) const = 0;

 
 
     wxImageList *m_imageListNormal, // images for tree elements
 
 
     wxImageList *m_imageListNormal, // images for tree elements


@@ -391,7 +419,10 @@ protected:
                  m_ownsImageListState;
 
     // spacing between left border and the text
                  m_ownsImageListState;
 
     // spacing between left border and the text

-    unsigned short m_spacing;
+    unsigned int m_spacing;
+
+    // whether full or quick calculation is done in DoGetBestSize
+    bool        m_quickBestSize;

 
 
     DECLARE_NO_COPY_CLASS(wxTreeCtrlBase)
 
 
     DECLARE_NO_COPY_CLASS(wxTreeCtrlBase)


@@ -404,9 +435,9 @@ protected:
 #if defined(__WXUNIVERSAL__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXPALMOS__)
 #if defined(__WXUNIVERSAL__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXPALMOS__)

-        #include "wx/palmos/treectrl.h"
+    #include "wx/palmos/treectrl.h"

 #elif defined(__WXMSW__)
 #elif defined(__WXMSW__)

-        #include "wx/msw/treectrl.h"
+    #include "wx/msw/treectrl.h"

 #elif defined(__WXMOTIF__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXGTK__)
 #elif defined(__WXMOTIF__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXGTK__)


@@ -419,5 +450,6 @@ protected:
     #include "wx/generic/treectlg.h"
 #endif
 
     #include "wx/generic/treectlg.h"
 #endif
 

-#endif // _WX_TREECTRL_H_BASE_
+#endif // wxUSE_TREECTRL

 
 

+#endif // _WX_TREECTRL_H_BASE_