X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46bde8dcf2245956223da69cce5bf93ba22a087e..38a097f588121ffcab2fa57e4494a6d0783c3567:/include/wx/msw/treectrl.h

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index bdb4123a74..5729f58904 100644
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -34,13 +34,14 @@ class  WXDLLEXPORT wxImageList;
 class  WXDLLEXPORT wxDragImage;
 struct WXDLLEXPORT wxTreeViewItem;
 
-// NB: all the following flags are for compatbility only and will be removed in the
-//     next versions
-
-// flags for deprecated InsertItem() variant (their values are the same as of
-// TVI_FIRST and TVI_LAST)
-#define wxTREE_INSERT_FIRST 0xFFFF0001
-#define wxTREE_INSERT_LAST  0xFFFF0002
+#if WXWIN_COMPATIBILITY_2_6
+    // NB: all the following flags are for compatbility only and will be removed in the
+    //     next versions
+    // flags for deprecated InsertItem() variant (their values are the same as of
+    // TVI_FIRST and TVI_LAST)
+    #define wxTREE_INSERT_FIRST 0xFFFF0001
+    #define wxTREE_INSERT_LAST  0xFFFF0002
+#endif
 
 // hash storing attributes for our items
 WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr);
@@ -78,7 +79,7 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
-    virtual size_t GetCount() const;
+    virtual unsigned int GetCount() const;
 
     virtual unsigned int GetIndent() const;
     virtual void SetIndent(unsigned int indent);
@@ -192,10 +193,10 @@ public:
     wxDEPRECATED( void ExpandItem(const wxTreeItemId& item, int action) );
 
         // use Set/GetImageList and Set/GetStateImageList
-    wxDEPRECATED( wxImageList *GetImageList(int) const );
+        // Use base class GetImageList()
     wxDEPRECATED( void SetImageList(wxImageList *imageList, int) );
 
-    // use Set/GetItemImage directly
+        // use Set/GetItemImage directly
     wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& item) const );
     wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& item, int image) );
 
@@ -223,6 +224,7 @@ public:
     virtual WXLRESULT MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
+    virtual bool MSWShouldPreProcessMessage(WXMSG* msg);
 
     // override some base class virtuals
     virtual bool SetBackgroundColour(const wxColour &colour);
@@ -246,6 +248,21 @@ protected:
     // end edit label
     void DoEndEditLabel(bool discardChanges = false);
 
+    virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent,
+                                      size_t pos,
+                                      const wxString& text,
+                                      int image, int selectedImage,
+                                      wxTreeItemData *data);
+    virtual wxTreeItemId DoInsertAfter(const wxTreeItemId& parent,
+                                       const wxTreeItemId& idPrevious,
+                                       const wxString& text,
+                                       int image = -1, int selImage = -1,
+                                       wxTreeItemData *data = NULL);
+    virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const;
+
+    // obtain the user data for the lParam member of TV_ITEM
+    class wxTreeItemParam *GetItemParam(const wxTreeItemId& item) const;
+
 
     // data used only while editing the item label:
     wxTextCtrl  *m_textCtrl;        // text control in which it is edited
@@ -261,35 +278,8 @@ private:
 
     inline void DoExpand(const wxTreeItemId& item, int flag);
 
-    virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent,
-                                      size_t pos,
-                                      const wxString& text,
-                                      int image, int selectedImage,
-                                      wxTreeItemData *data);
-    virtual wxTreeItemId DoInsertAfter(const wxTreeItemId& parent,
-                                       const wxTreeItemId& idPrevious,
-                                       const wxString& text,
-                                       int image = -1, int selImage = -1,
-                                       wxTreeItemData *data = NULL);
-    virtual wxTreeItemId DoHitTest(const wxPoint& point, int& flags);
-
-    int DoGetItemImageFromData(const wxTreeItemId& item,
-                               wxTreeItemIcon which) const;
-    void DoSetItemImageFromData(const wxTreeItemId& item,
-                                int image,
-                                wxTreeItemIcon which) const;
-    void DoSetItemImages(const wxTreeItemId& item, int image, int imageSel);
-
     void DeleteTextCtrl();
 
-    // support for additional item images which we implement using
-    // wxTreeItemIndirectData technique - see the comments in msw/treectrl.cpp
-    void SetIndirectItemData(const wxTreeItemId& item,
-                             class wxTreeItemIndirectData *data);
-    bool HasIndirectData(const wxTreeItemId& item) const;
-    bool IsDataIndirect(wxTreeItemData *data) const
-        { return data && data->GetId().m_pItem == 0; }
-
     // the hash storing the items attributes (indexed by item ids)
     wxMapTreeAttr m_attrs;