X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6fb8636e551162537ac094da81bafa5ee7fdf83..032e024c1c6ab6a20226604baab9d00558620e72:/include/wx/os2/treectrl.h diff --git a/include/wx/os2/treectrl.h b/include/wx/os2/treectrl.h index 7c5e19b717..4a99d302bf 100644 --- a/include/wx/os2/treectrl.h +++ b/include/wx/os2/treectrl.h @@ -16,10 +16,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma interface "treectrl.h" -#endif - #if wxUSE_TREECTRL #include "wx/textctrl.h" @@ -31,27 +27,20 @@ typedef long wxDataType; // fwd decl -class WXDLLEXPORT wxImageList; -class WXDLLEXPORT wxDragImage; -struct WXDLLEXPORT wxTreeViewItem; +class WXDLLIMPEXP_CORE wxImageList; +class WXDLLIMPEXP_CORE wxDragImage; +struct WXDLLIMPEXP_FWD_CORE wxTreeViewItem; // a callback function used for sorting tree items, it should return -1 if the // first item precedes the second, +1 if the second precedes the first or 0 if // they're equivalent class wxTreeItemData; -// flags for deprecated `Expand(int action)' -enum -{ - wxTREE_EXPAND_EXPAND, - wxTREE_EXPAND_COLLAPSE, - wxTREE_EXPAND_COLLAPSE_RESET, - wxTREE_EXPAND_TOGGLE -}; - -// flags for deprecated InsertItem() variant -#define wxTREE_INSERT_FIRST 0xFFFF0001 -#define wxTREE_INSERT_LAST 0xFFFF0002 +#if WXWIN_COMPATIBILITY_2_6 + // flags for deprecated InsertItem() variant + #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); @@ -59,7 +48,7 @@ WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr); // ---------------------------------------------------------------------------- // wxTreeCtrl // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTreeCtrl : public wxControl +class WXDLLIMPEXP_CORE wxTreeCtrl : public wxControl { public: // creation @@ -67,7 +56,7 @@ public: wxTreeCtrl() { Init(); } wxTreeCtrl( wxWindow* pParent - ,wxWindowID vId = -1 + ,wxWindowID vId = wxID_ANY ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT @@ -87,7 +76,7 @@ public: virtual ~wxTreeCtrl(); bool Create( wxWindow* pParent - ,wxWindowID vId = -1 + ,wxWindowID vId = wxID_ANY ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT @@ -103,7 +92,7 @@ public: // // Get the total number of items in the control // - size_t GetCount(void) const; + virtual unsigned int GetCount(void) const; // // Indent is the number of pixels the children are indented relative to @@ -286,14 +275,6 @@ public: // wxTreeItemId GetItemParent(const wxTreeItemId& rItem) const; -#if WXWIN_COMPATIBILITY_2_2 - // deprecated: Use GetItemParent instead. - wxDEPRECATED( wxTreeItemId GetParent(const wxTreeItemId& item) const); - - // Expose the base class method hidden by the one above. Not deprecatable. - wxWindow *GetParent() const { return wxControl::GetParent(); } -#endif // WXWIN_COMPATIBILITY_2_2 - // for this enumeration function you must pass in a "cookie" parameter // which is opaque for the application but is necessary for the library // to make these functions reentrant (i.e. allow more than one @@ -467,7 +448,7 @@ public: // // returns NULL for OS/2 in ALL cases // - wxTextCtrl* GetEditControl(void) const {return (wxTextCtrl*)NULL;} + wxTextCtrl* GetEditControl(void) const {return NULL;} // // End editing and accept or discard the changes to item label @@ -525,70 +506,6 @@ public: ,bool bTextOnly = false ) const; - // - // Deprecated - // ---------- - -#if WXWIN_COMPATIBILITY_2_4 - // These methods are deprecated and will be removed in future versions of - // wxWidgets, they're here for compatibility only, don't use them in new - // code (the comments indicate why these methods are now useless and how to - // replace them) - // - - // - // Use Expand, Collapse, CollapseAndReset or Toggle - // - wxDEPRECATED( void ExpandItem( const wxTreeItemId& rItem - ,int nAction - ) ); - - // - // Use AddRoot, PrependItem or AppendItem - // - wxDEPRECATED( wxTreeItemId InsertItem( const wxTreeItemId& pParent - ,const wxString& rsText - ,int nImage = -1 - ,int nSelImage = -1 - ,long lInsertAfter = wxTREE_INSERT_LAST - ) ); - - // - // Use Set/GetImageList and Set/GetStateImageList - // - wxDEPRECATED( wxImageList* GetImageList(int nVal) const ); - wxDEPRECATED( void SetImageList(wxImageList* pImageList, int nVal) ); - - // - // Use Set/GetItemImage directly - // - wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& rItem) const ); - wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& rItem, int nImage) ); - - // - // For this enumeration function you must pass in a "cookie" parameter - // which is opaque for the application but is necessary for the library - // to make these functions reentrant (i.e. allow more than one - // enumeration on one and the same object simultaneously). Of course, - // the "cookie" passed to GetFirstChild() and GetNextChild() should be - // the same! - // - - // - // Get the first child of this item - // - wxDEPRECATED( wxTreeItemId GetFirstChild( const wxTreeItemId& rItem - ,long& rCookie - ) const ); - - // - // Get the next child - // - wxDEPRECATED( wxTreeItemId GetNextChild( const wxTreeItemId& rItem - ,long& rCookie - ) const ); -#endif // WXWIN_COMPATIBILITY_2_4 - // // Implementation // -------------- @@ -707,7 +624,7 @@ private: friend class wxTreeSortHelper; DECLARE_DYNAMIC_CLASS(wxTreeCtrl) - DECLARE_NO_COPY_CLASS(wxTreeCtrl) + wxDECLARE_NO_COPY_CLASS(wxTreeCtrl); }; // end of CLASS wxTreeCtrl #endif // wxUSE_TREECTRL