Clear columns on destruction

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

diff --git a/include/wx/mac/carbon/treectrl.h b/include/wx/mac/carbon/treectrl.h
index 3bf45fe30058d1f8e50b1df3e3055d94820e0a82..a8c92b288ffb9d85c60b45bbbb8b01b9378bf8f1 100644 (file)
--- a/include/wx/mac/carbon/treectrl.h
+++ b/include/wx/mac/carbon/treectrl.h
@@ -52,7 +52,7 @@ enum {
     wxTREE_NEXT_CHILD,                 // Retrieves the first child item. The hItem parameter must be NULL.
     wxTREE_NEXT_DROPHILITE,            // Retrieves the item that is the target of a drag-and-drop operation.
     wxTREE_NEXT_FIRSTVISIBLE,          // Retrieves the first visible item.
     wxTREE_NEXT_CHILD,                 // Retrieves the first child item. The hItem parameter must be NULL.
     wxTREE_NEXT_DROPHILITE,            // Retrieves the item that is the target of a drag-and-drop operation.
     wxTREE_NEXT_FIRSTVISIBLE,          // Retrieves the first visible item.

-    wxTREE_NEXT_NEXT,                 // Retrieves the next sibling item.
+    wxTREE_NEXT_NEXT,                  // Retrieves the next sibling item.

     wxTREE_NEXT_NEXTVISIBLE,           // Retrieves the next visible item that follows the specified item.
     wxTREE_NEXT_PARENT,                // Retrieves the parent of the specified item.
     wxTREE_NEXT_PREVIOUS,              // Retrieves the previous sibling item.
     wxTREE_NEXT_NEXTVISIBLE,           // Retrieves the next visible item that follows the specified item.
     wxTREE_NEXT_PARENT,                // Retrieves the parent of the specified item.
     wxTREE_NEXT_PREVIOUS,              // Retrieves the previous sibling item.


@@ -60,17 +60,21 @@ enum {
     wxTREE_NEXT_ROOT                   // Retrieves the first child item of the root item of which the specified item is a part.
 };
 
     wxTREE_NEXT_ROOT                   // Retrieves the first child item of the root item of which the specified item is a part.
 };
 

-// Flags for InsertItem
-enum {
-    wxTREE_INSERT_LAST = -1,
-    wxTREE_INSERT_FIRST = -2,
-    wxTREE_INSERT_SORT = -3
-};
+#if WXWIN_COMPATIBILITY_2_6
+    // Flags for InsertItem
+    enum {
+        wxTREE_INSERT_LAST = -1,
+        wxTREE_INSERT_FIRST = -2,
+        wxTREE_INSERT_SORT = -3
+    };
+#endif

 
 

-class WXDLLEXPORT wxTreeItem: public wxObject
+class WXDLLIMPEXP_CORE wxTreeItem: public wxObject

 {
 {

- DECLARE_DYNAMIC_CLASS(wxTreeItem)
+    DECLARE_DYNAMIC_CLASS(wxTreeItem)
+

 public:
 public:

+

     long            m_mask;
     long            m_itemId;
     long            m_state;
     long            m_mask;
     long            m_itemId;
     long            m_state;


@@ -105,7 +109,7 @@ public:
     inline void SetData(long data) { m_data = data; }
 };
 
     inline void SetData(long data) { m_data = data; }
 };
 

-class WXDLLEXPORT wxTreeCtrl: public wxControl
+class WXDLLIMPEXP_CORE wxTreeCtrl: public wxControl

 {
 public:
    /*
 {
 public:
    /*


@@ -125,7 +129,7 @@ public:
     {
         Create(parent, id, pos, size, style, validator, name);
     }
     {
         Create(parent, id, pos, size, style, validator, name);
     }

-    ~wxTreeCtrl();
+    virtual ~wxTreeCtrl();

 
     bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
                 const wxPoint& pos = wxDefaultPosition,
 
     bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
                 const wxPoint& pos = wxDefaultPosition,


@@ -144,7 +148,6 @@ public:
     void SetIndent(int indent);
       // image list
     wxImageList *GetImageList(int which = wxIMAGE_LIST_NORMAL) const;
     void SetIndent(int indent);
       // image list
     wxImageList *GetImageList(int which = wxIMAGE_LIST_NORMAL) const;

-    void SetImageList(wxImageList *imageList, int which = wxIMAGE_LIST_NORMAL);

 
       // navigation inside the tree
     long GetNextItem(long item, int code) const;
 
       // navigation inside the tree
     long GetNextItem(long item, int code) const;


@@ -173,8 +176,8 @@ public:
       // convenience function
     bool IsItemExpanded(long item)
     {
       // convenience function
     bool IsItemExpanded(long item)
     {

-      return (GetItemState(item, wxTREE_STATE_EXPANDED) &
-                           wxTREE_STATE_EXPANDED) != 0;
+        return (GetItemState(item, wxTREE_STATE_EXPANDED) &
+                             wxTREE_STATE_EXPANDED) != 0;

     }
 
       // bounding rect
     }
 
       // bounding rect


@@ -186,20 +189,25 @@ public:
     // ----------
       // adding/deleting items
     bool DeleteItem(long item);
     // ----------
       // adding/deleting items
     bool DeleteItem(long item);

-    long InsertItem(long parent, wxTreeItem& info,
-                    long insertAfter = wxTREE_INSERT_LAST);
-      // If image > -1 and selImage == -1, the same image is used for
-      // both selected and unselected items.
-    long InsertItem(long parent, const wxString& label,
-                    int image = -1, int selImage = -1,
-                    long insertAfter = wxTREE_INSERT_LAST);
+
+#if WXWIN_COMPATIBILITY_2_6
+    wxDEPRECATED( long InsertItem(long parent, wxTreeItem& info,
+                  long insertAfter = wxTREE_INSERT_LAST) );
+        // If image > -1 and selImage == -1, the same image is used for
+        // both selected and unselected items.
+    wxDEPRECATED( long InsertItem(long parent, const wxString& label,
+                                  int image = -1, int selImage = -1,
+                                  long insertAfter = wxTREE_INSERT_LAST) );
+
+        // use Expand, Collapse, CollapseAndReset or Toggle
+    wxDEPRECATED( bool ExpandItem(long item, int action) );
+    wxDEPRECATED( void SetImageList(wxImageList *imageList, int which = wxIMAGE_LIST_NORMAL) );
+#endif // WXWIN_COMPATIBILITY_2_6

 
       // changing item state
     bool ExpandItem(long item)   { return ExpandItem(item, wxTREE_EXPAND_EXPAND);   }
     bool CollapseItem(long item) { return ExpandItem(item, wxTREE_EXPAND_COLLAPSE); }
     bool ToggleItem(long item)   { return ExpandItem(item, wxTREE_EXPAND_TOGGLE);   }
 
       // changing item state
     bool ExpandItem(long item)   { return ExpandItem(item, wxTREE_EXPAND_EXPAND);   }
     bool CollapseItem(long item) { return ExpandItem(item, wxTREE_EXPAND_COLLAPSE); }
     bool ToggleItem(long item)   { return ExpandItem(item, wxTREE_EXPAND_TOGGLE);   }

-      // common interface for {Expand|Collapse|Toggle}Item
-    bool ExpandItem(long item, int action);

 
       //
     bool SelectItem(long item);
 
       //
     bool SelectItem(long item);


@@ -244,22 +252,22 @@ protected:
  wxEVT_COMMAND_TREE_KEY_DOWN
 */
 
  wxEVT_COMMAND_TREE_KEY_DOWN
 */
 

-class WXDLLEXPORT wxTreeEvent: public wxCommandEvent
+class WXDLLIMPEXP_CORE wxTreeEvent: public wxCommandEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxTreeEvent)
+    DECLARE_DYNAMIC_CLASS(wxTreeEvent)

 
 

- public:
-  wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
+public:
+    wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);

 
 

-  int           m_code;
-  wxTreeItem    m_item;
-  long          m_oldItem;
-  wxPoint       m_pointDrag;
+    int           m_code;
+    wxTreeItem    m_item;
+    long          m_oldItem;
+    wxPoint       m_pointDrag;

 
 

-  inline long GetOldItem() const { return m_oldItem; }
-  inline wxTreeItem& GetItem() const { return (wxTreeItem&) m_item; }
-  inline wxPoint GetPoint() const { return m_pointDrag; }
-  inline int GetCode() const { return m_code; }
+    inline long GetOldItem() const { return m_oldItem; }
+    inline wxTreeItem& GetItem() const { return (wxTreeItem&) m_item; }
+    inline wxPoint GetPoint() const { return m_pointDrag; }
+    inline int GetCode() const { return m_code; }

 };
 
 typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
 };
 
 typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);