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

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

diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index 56dce5239d08fa16749f71a29c9310b08fd1c62c..c70691455852880bc956a29f57a678c4faacca96 100644 (file)
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -70,13 +70,7 @@ public:
         // invalidate the item
     void Unset() { m_pItem = 0; }
 
         // invalidate the item
     void Unset() { m_pItem = 0; }
 

-#if WXWIN_COMPATIBILITY_2_4
-    // deprecated: only for compatibility, don't work on 64 bit archs
-    wxTreeItemId(long item) { m_pItem = wxUIntToPtr(item); }
-    operator long() const { return (long)wxPtrToUInt(m_pItem); }
-#else // !WXWIN_COMPATIBILITY_2_4

     operator bool() const { return IsOk(); }
     operator bool() const { return IsOk(); }

-#endif // WXWIN_COMPATIBILITY_2_4/!WXWIN_COMPATIBILITY_2_4

 
     wxTreeItemIdValue m_pItem;
 };
 
     wxTreeItemIdValue m_pItem;
 };


@@ -107,8 +101,8 @@ inline bool operator!=(const wxTreeItemId& i1, const wxTreeItemId& i2)
 
 class WXDLLEXPORT wxTreeItemData: public wxClientData
 {
 
 class WXDLLEXPORT wxTreeItemData: public wxClientData
 {

-friend class WXDLLEXPORT wxTreeCtrl;
-friend class WXDLLEXPORT wxGenericTreeCtrl;
+friend class WXDLLIMPEXP_FWD_CORE wxTreeCtrl;
+friend class WXDLLIMPEXP_FWD_CORE wxGenericTreeCtrl;

 public:
     // creation/destruction
     // --------------------
 public:
     // creation/destruction
     // --------------------


@@ -168,7 +162,11 @@ enum wxTreeItemIcon
 
 #define wxTR_SINGLE                  0x0000     // for convenience
 #define wxTR_MULTIPLE                0x0020     // can select multiple items
 
 #define wxTR_SINGLE                  0x0000     // for convenience
 #define wxTR_MULTIPLE                0x0020     // can select multiple items

-#define wxTR_EXTENDED                0x0040     // TODO: allow extended selection
+
+#if WXWIN_COMPATIBILITY_2_8
+    #define wxTR_EXTENDED            0x0040     // deprecated, don't use
+#endif // WXWIN_COMPATIBILITY_2_8
+

 #define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080     // what it says
 
 #define wxTR_EDIT_LABELS             0x0200     // can edit item labels
 #define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080     // what it says
 
 #define wxTR_EDIT_LABELS             0x0200     // can edit item labels


@@ -265,7 +263,7 @@ private:
 //     descriptions below
 // ----------------------------------------------------------------------------
 
 //     descriptions below
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT  wxTreeCtrlBase;
+class WXDLLIMPEXP_FWD_CORE wxTreeCtrlBase;

 
 class WXDLLEXPORT wxTreeEvent : public wxNotifyEvent
 {
 
 class WXDLLEXPORT wxTreeEvent : public wxNotifyEvent
 {


@@ -320,8 +318,8 @@ private:
     wxString      m_label;
     bool          m_editCancelled;
 
     wxString      m_label;
     bool          m_editCancelled;
 

-    friend class WXDLLEXPORT wxTreeCtrl;
-    friend class WXDLLEXPORT wxGenericTreeCtrl;
+    friend class WXDLLIMPEXP_FWD_CORE wxTreeCtrl;
+    friend class WXDLLIMPEXP_FWD_CORE wxGenericTreeCtrl;

 
     DECLARE_DYNAMIC_CLASS(wxTreeEvent)
 };
 
     DECLARE_DYNAMIC_CLASS(wxTreeEvent)
 };