Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Old API deprecated. Source cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-01-11 21:17:16 +00:00
parent 53701799b4
commit a6fb8636e5
8 changed files with 114 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/generic/treectlg.h
View File

@@ -358,10 +358,8 @@ public:
#if WXWIN_COMPATIBILITY_2_4
// deprecated functions: use Set/GetItemImage directly
int GetItemSelectedImage(const wxTreeItemId& item) const
{ return GetItemImage(item, wxTreeItemIcon_Selected); }
void SetItemSelectedImage(const wxTreeItemId& item, int image)
{ SetItemImage(item, image, wxTreeItemIcon_Selected); }
wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& item) const );
wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& item, int image) );
// use the versions taking wxTreeItemIdValue cookies (note that
// GetNextChild() is not inside wxDEPRECATED on purpose, as otherwise we
@@ -449,7 +447,7 @@ protected:
// incremental search data
wxString m_findPrefix;
wxTimer *m_findTimer;
bool m_dropEffectAboveItem;
// the common part of all ctors

10
include/wx/msw/treectrl.h
View File

@@ -395,14 +395,12 @@ public:
long insertAfter = wxTREE_INSERT_LAST) );
// use Set/GetImageList and Set/GetStateImageList
wxImageList *GetImageList(int) const { return GetImageList(); }
void SetImageList(wxImageList *imageList, int) { SetImageList(imageList); }
wxDEPRECATED( wxImageList *GetImageList(int) const );
wxDEPRECATED( void SetImageList(wxImageList *imageList, int) );
// use Set/GetItemImage directly
int GetItemSelectedImage(const wxTreeItemId& item) const
{ return GetItemImage(item, wxTreeItemIcon_Selected); }
void SetItemSelectedImage(const wxTreeItemId& item, int image)
{ SetItemImage(item, image, wxTreeItemIcon_Selected); }
wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& item) const );
wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& item, int image) );
// use the versions taking wxTreeItemIdValue cookies
wxDEPRECATED( wxTreeItemId GetFirstChild(const wxTreeItemId& item,

13
include/wx/os2/treectrl.h
View File

@@ -556,18 +556,15 @@ public:
//
// Use Set/GetImageList and Set/GetStateImageList
//
wxImageList* GetImageList(int nVal) const
{ return GetImageList(); }
void SetImageList(wxImageList* pImageList, int nVal)
{ SetImageList(pImageList); }
wxDEPRECATED( wxImageList* GetImageList(int nVal) const );
wxDEPRECATED( void SetImageList(wxImageList* pImageList, int nVal) );
//
// Use Set/GetItemImage directly
//
int GetItemSelectedImage(const wxTreeItemId& rItem) const
{ return GetItemImage(rItem, wxTreeItemIcon_Selected); }
void SetItemSelectedImage(const wxTreeItemId& rItem, int nImage)
{ SetItemImage(rItem, nImage, wxTreeItemIcon_Selected); }
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

6
include/wx/url.h
View File

@@ -71,9 +71,9 @@ public:
#if WXWIN_COMPATIBILITY_2_4
//Use the proper wxURI accessors instead
wxString GetProtocolName() const { return m_scheme; }
wxString GetHostName() const { return m_server; }
wxString GetPath() const { return m_path; }
wxDEPRECATED( wxString GetProtocolName() const );
wxDEPRECATED( wxString GetHostName() const );
wxDEPRECATED( wxString GetPath() const );
//Use wxURI instead - this does not work that well
wxDEPRECATED( static wxString ConvertToValidURI(