added wxUSE_SVG

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

diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index 445b4c28bc3e01a18cbdaac55eb7addc45959c15..c70691455852880bc956a29f57a678c4faacca96 100644 (file)
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        treebase.h
+// Name:        wx/treebase.h

 // Purpose:     wxTreeCtrl base classes and types
 // Author:      Julian Smart et al
 // Modified by:
 // Purpose:     wxTreeCtrl base classes and types
 // Author:      Julian Smart et al
 // Modified by:


@@ -24,6 +24,8 @@
 #include "wx/event.h"
 #include "wx/dynarray.h"
 
 #include "wx/event.h"
 #include "wx/dynarray.h"
 

+#if WXWIN_COMPATIBILITY_2_6
+

 // flags for deprecated `Expand(int action)', will be removed in next versions
 enum
 {
 // flags for deprecated `Expand(int action)', will be removed in next versions
 enum
 {


@@ -33,6 +35,8 @@ enum
     wxTREE_EXPAND_TOGGLE
 };
 
     wxTREE_EXPAND_TOGGLE
 };
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

 // ----------------------------------------------------------------------------
 // wxTreeItemId identifies an element of the tree. In this implementation, it's
 // just a trivial wrapper around Win32 HTREEITEM or a pointer to some private
 // ----------------------------------------------------------------------------
 // wxTreeItemId identifies an element of the tree. In this implementation, it's
 // just a trivial wrapper around Win32 HTREEITEM or a pointer to some private


@@ -66,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;
 };


@@ -103,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
     // --------------------


@@ -164,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


@@ -179,9 +181,11 @@ enum wxTreeItemIcon
 #define wxTR_DEFAULT_STYLE           (wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT)
 #endif
 
 #define wxTR_DEFAULT_STYLE           (wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT)
 #endif
 

+#if WXWIN_COMPATIBILITY_2_6

 // deprecated, don't use
 #define wxTR_MAC_BUTTONS             0
 #define wxTR_AQUA_BUTTONS            0
 // deprecated, don't use
 #define wxTR_MAC_BUTTONS             0
 #define wxTR_AQUA_BUTTONS            0

+#endif // WXWIN_COMPATIBILITY_2_6

 
 
 // values for the `flags' parameter of wxTreeCtrl::HitTest() which determine
 
 
 // values for the `flags' parameter of wxTreeCtrl::HitTest() which determine


@@ -259,11 +263,16 @@ private:
 //     descriptions below
 // ----------------------------------------------------------------------------
 
 //     descriptions below
 // ----------------------------------------------------------------------------
 

+class WXDLLIMPEXP_FWD_CORE wxTreeCtrlBase;
+

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

+    wxTreeEvent(wxEventType commandType,
+                wxTreeCtrlBase *tree,
+                const wxTreeItemId &item = wxTreeItemId());

     wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
     wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);

-    wxTreeEvent(const wxTreeEvent & event);
+    wxTreeEvent(const wxTreeEvent& event);

 
     virtual wxEvent *Clone() const { return new wxTreeEvent(*this); }
 
 
     virtual wxEvent *Clone() const { return new wxTreeEvent(*this); }
 


@@ -309,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)
 };


@@ -413,4 +422,3 @@ END_DECLARE_EVENT_TYPES()
 #endif // wxUSE_TREECTRL
 
 #endif // _WX_TREEBASE_H_
 #endif // wxUSE_TREECTRL
 
 #endif // _WX_TREEBASE_H_

-