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

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

@@ -395,14 +395,12 @@ public:
long insertAfter = wxTREE_INSERT_LAST) ); long insertAfter = wxTREE_INSERT_LAST) );
// use Set/GetImageList and Set/GetStateImageList // use Set/GetImageList and Set/GetStateImageList
wxImageList *GetImageList(int) const { return GetImageList(); } wxDEPRECATED( wxImageList *GetImageList(int) const );
void SetImageList(wxImageList *imageList, int) { SetImageList(imageList); } wxDEPRECATED( void SetImageList(wxImageList *imageList, int) );
// use Set/GetItemImage directly // use Set/GetItemImage directly
int GetItemSelectedImage(const wxTreeItemId& item) const wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& item) const );
{ return GetItemImage(item, wxTreeItemIcon_Selected); } wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& item, int image) );
void SetItemSelectedImage(const wxTreeItemId& item, int image)
{ SetItemImage(item, image, wxTreeItemIcon_Selected); }
// use the versions taking wxTreeItemIdValue cookies // use the versions taking wxTreeItemIdValue cookies
wxDEPRECATED( wxTreeItemId GetFirstChild(const wxTreeItemId& item, 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 // Use Set/GetImageList and Set/GetStateImageList
// //
wxImageList* GetImageList(int nVal) const wxDEPRECATED( wxImageList* GetImageList(int nVal) const );
{ return GetImageList(); } wxDEPRECATED( void SetImageList(wxImageList* pImageList, int nVal) );
void SetImageList(wxImageList* pImageList, int nVal)
{ SetImageList(pImageList); }
// //
// Use Set/GetItemImage directly // Use Set/GetItemImage directly
// //
int GetItemSelectedImage(const wxTreeItemId& rItem) const wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& rItem) const );
{ return GetItemImage(rItem, wxTreeItemIcon_Selected); } wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& rItem, int nImage) );
void SetItemSelectedImage(const wxTreeItemId& rItem, int nImage)
{ SetItemImage(rItem, nImage, wxTreeItemIcon_Selected); }
// //
// For this enumeration function you must pass in a "cookie" parameter // For this enumeration function you must pass in a "cookie" parameter
// which is opaque for the application but is necessary for the library // 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 #if WXWIN_COMPATIBILITY_2_4
//Use the proper wxURI accessors instead //Use the proper wxURI accessors instead
wxString GetProtocolName() const { return m_scheme; } wxDEPRECATED( wxString GetProtocolName() const );
wxString GetHostName() const { return m_server; } wxDEPRECATED( wxString GetHostName() const );
wxString GetPath() const { return m_path; } wxDEPRECATED( wxString GetPath() const );
//Use wxURI instead - this does not work that well //Use wxURI instead - this does not work that well
wxDEPRECATED( static wxString ConvertToValidURI( wxDEPRECATED( static wxString ConvertToValidURI(

15
src/common/uri.cpp
View File

@@ -1237,6 +1237,21 @@ bool wxURI::IsDigit(const wxChar& c)
#include "wx/url.h" #include "wx/url.h"
wxString wxURL::GetProtocolName() const
{
return m_scheme;
}
wxString wxURL::GetHostName() const
{
return m_server;
}
wxString wxURL::GetPath() const
{
return m_path;
}
//Note that this old code really doesn't convert to a URI that well and looks //Note that this old code really doesn't convert to a URI that well and looks
//more like a dirty hack than anything else... //more like a dirty hack than anything else...

16
src/generic/treectlg.cpp
View File

@@ -3088,7 +3088,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
// remember the old cursor because we will change it while // remember the old cursor because we will change it while
// dragging // dragging
m_oldCursor = m_cursor; m_oldCursor = m_cursor;
// in a single selection control, hide the selection temporarily // in a single selection control, hide the selection temporarily
if ( !(GetWindowStyleFlag() & wxTR_MULTIPLE) ) if ( !(GetWindowStyleFlag() & wxTR_MULTIPLE) )
{ {
@@ -3563,6 +3563,20 @@ wxGenericTreeCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
#endif #endif
} }
#if WXWIN_COMPATIBILITY_2_4
int wxGenericTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
{
return GetItemImage(item, wxTreeItemIcon_Selected);
}
void wxGenericTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
{
SetItemImage(item, image, wxTreeItemIcon_Selected);
}
#endif // WXWIN_COMPATIBILITY_2_4
#if WXWIN_COMPATIBILITY_2_2 #if WXWIN_COMPATIBILITY_2_2
wxTreeItemId wxGenericTreeCtrl::GetParent(const wxTreeItemId& item) const wxTreeItemId wxGenericTreeCtrl::GetParent(const wxTreeItemId& item) const

22
src/msw/treectrl.cpp
View File

@@ -1719,6 +1719,26 @@ wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
image, selImage, NULL); image, selImage, NULL);
} }
wxImageList *wxTreeCtrl::GetImageList(int) const
{
return GetImageList();
}
void wxTreeCtrl::SetImageList(wxImageList *imageList, int)
{
SetImageList(imageList);
}
int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
{
return GetItemImage(item, wxTreeItemIcon_Selected);
}
void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
{
SetItemImage(item, image, wxTreeItemIcon_Selected);
}
#endif // WXWIN_COMPATIBILITY_2_4 #endif // WXWIN_COMPATIBILITY_2_4
wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text, wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
@@ -1900,10 +1920,12 @@ void wxTreeCtrl::Toggle(const wxTreeItemId& item)
} }
#if WXWIN_COMPATIBILITY_2_4 #if WXWIN_COMPATIBILITY_2_4
void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action) void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
{ {
DoExpand(item, action); DoExpand(item, action);
} }
#endif #endif
void wxTreeCtrl::Unselect() void wxTreeCtrl::Unselect()

62
src/os2/treectrl.cpp
View File

@@ -346,9 +346,9 @@ void wxTreeCtrl::Init ()
{ {
m_pImageListNormal = NULL; m_pImageListNormal = NULL;
m_pImageListState = NULL; m_pImageListState = NULL;
m_bOwnsImageListNormal = FALSE; m_bOwnsImageListNormal = false;
m_bOwnsImageListState = FALSE; m_bOwnsImageListState = false;
m_bHasAnyAttr = FALSE; m_bHasAnyAttr = false;
m_pDragImage = NULL; m_pDragImage = NULL;
// //
@@ -440,7 +440,7 @@ wxTreeCtrl::~wxTreeCtrl ()
{ {
delete (wxTreeItemAttr *)pNode->Data(); delete (wxTreeItemAttr *)pNode->Data();
} }
m_bHasAnyAttr = FALSE; m_bHasAnyAttr = false;
} }
DeleteTextCtrl(); DeleteTextCtrl();
@@ -544,6 +544,30 @@ wxImageList* wxTreeCtrl::GetImageList () const
return m_pImageListNormal; return m_pImageListNormal;
} // end of wxTreeCtrl::GetImageList } // end of wxTreeCtrl::GetImageList
#if WXWIN_COMPATIBILITY_2_4
wxImageList* wxTreeCtrl::GetImageList(int nVal) const
{
return GetImageList();
}
void wxTreeCtrl::SetImageList(wxImageList* pImageList, int nVal)
{
SetImageList(pImageList);
}
int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& rItem) const
{
return GetItemImage(rItem, wxTreeItemIcon_Selected);
}
void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& rItem, int nImage)
{
SetItemImage(rItem, nImage, wxTreeItemIcon_Selected);
}
#endif // WXWIN_COMPATIBILITY_2_4
wxImageList* wxTreeCtrl::GetStateImageList () const wxImageList* wxTreeCtrl::GetStateImageList () const
{ {
return m_pImageListNormal; return m_pImageListNormal;
@@ -568,7 +592,7 @@ void wxTreeCtrl::SetImageList (
{ {
if (m_bOwnsImageListNormal) if (m_bOwnsImageListNormal)
delete m_pImageListNormal; delete m_pImageListNormal;
m_bOwnsImageListNormal = FALSE; m_bOwnsImageListNormal = false;
} // end of wxTreeCtrl::SetImageList } // end of wxTreeCtrl::SetImageList
void wxTreeCtrl::SetStateImageList ( void wxTreeCtrl::SetStateImageList (
@@ -577,21 +601,21 @@ void wxTreeCtrl::SetStateImageList (
{ {
if (m_bOwnsImageListState) if (m_bOwnsImageListState)
delete m_pImageListState; delete m_pImageListState;
m_bOwnsImageListState = FALSE; m_bOwnsImageListState = false;
} // end of wxTreeCtrl::SetStateImageList } // end of wxTreeCtrl::SetStateImageList
void wxTreeCtrl::AssignImageList ( void wxTreeCtrl::AssignImageList (
wxImageList* WXUNUSED(pImageList) wxImageList* WXUNUSED(pImageList)
) )
{ {
m_bOwnsImageListNormal = TRUE; m_bOwnsImageListNormal = true;
} // end of wxTreeCtrl::AssignImageList } // end of wxTreeCtrl::AssignImageList
void wxTreeCtrl::AssignStateImageList ( void wxTreeCtrl::AssignStateImageList (
wxImageList* WXUNUSED(pImageList) wxImageList* WXUNUSED(pImageList)
) )
{ {
m_bOwnsImageListState = TRUE; m_bOwnsImageListState = true;
} // end of wxTreeCtrl::AssignStateImageList } // end of wxTreeCtrl::AssignStateImageList
size_t wxTreeCtrl::GetChildrenCount ( size_t wxTreeCtrl::GetChildrenCount (
@@ -974,7 +998,7 @@ void wxTreeCtrl::SetItemTextColour (
, const wxColour& rCol , const wxColour& rCol
) )
{ {
m_bHasAnyAttr = TRUE; m_bHasAnyAttr = true;
long lId = (long)rItem.m_pItem; long lId = (long)rItem.m_pItem;
wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId); wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId);
@@ -993,7 +1017,7 @@ void wxTreeCtrl::SetItemBackgroundColour (
, const wxColour& rCol , const wxColour& rCol
) )
{ {
m_bHasAnyAttr = TRUE; m_bHasAnyAttr = true;
long lId = (long)rItem.m_pItem; long lId = (long)rItem.m_pItem;
wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId); wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId);
@@ -1012,7 +1036,7 @@ void wxTreeCtrl::SetItemFont (
, const wxFont& rFont , const wxFont& rFont
) )
{ {
m_bHasAnyAttr = TRUE; m_bHasAnyAttr = true;
long lId = (long)rItem.m_pItem; long lId = (long)rItem.m_pItem;
wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId); wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId);
@@ -1478,6 +1502,8 @@ wxTreeItemId wxTreeCtrl::DoInsertItem (
return wxTreeItemId((long)pRecord->m_ulItemId); return wxTreeItemId((long)pRecord->m_ulItemId);
} }
#if WXWIN_COMPATIBILITY_2_4
// for compatibility only // for compatibility only
wxTreeItemId wxTreeCtrl::InsertItem ( wxTreeItemId wxTreeCtrl::InsertItem (
const wxTreeItemId& rParent const wxTreeItemId& rParent
@@ -1496,6 +1522,8 @@ wxTreeItemId wxTreeCtrl::InsertItem (
); );
} // end of wxTreeCtrl::InsertItem } // end of wxTreeCtrl::InsertItem
#endif // WXWIN_COMPATIBILITY_2_4
wxTreeItemId wxTreeCtrl::AddRoot ( wxTreeItemId wxTreeCtrl::AddRoot (
const wxString& rsText const wxString& rsText
, int nImage , int nImage
@@ -1736,6 +1764,8 @@ void wxTreeCtrl::Toggle (
); );
} // end of wxTreeCtrl::Toggle } // end of wxTreeCtrl::Toggle
#if WXWIN_COMPATIBILITY_2_4
void wxTreeCtrl::ExpandItem ( void wxTreeCtrl::ExpandItem (
const wxTreeItemId& rItem const wxTreeItemId& rItem
, int nAction , int nAction
@@ -1746,6 +1776,8 @@ void wxTreeCtrl::ExpandItem (
); );
} // end of wxTreeCtrl::ExpandItem } // end of wxTreeCtrl::ExpandItem
#endif // WXWIN_COMPATIBILITY_2_4
void wxTreeCtrl::Unselect () void wxTreeCtrl::Unselect ()
{ {
wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE), wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE),
@@ -1767,7 +1799,7 @@ void wxTreeCtrl::UnselectAll ()
for (size_t n = 0; n < nCount; n++) for (size_t n = 0; n < nCount; n++)
{ {
SetItemCheck( aSelections[n] SetItemCheck( aSelections[n]
,FALSE ,false
); );
} }
} }
@@ -2051,7 +2083,7 @@ MRESULT wxTreeCtrl::OS2WindowProc (
vEventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT; vEventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
vEvent.m_item = pRecord->m_ulItemId; vEvent.m_item = pRecord->m_ulItemId;
vEvent.m_label = pRecord->m_vRecord.pszTree; vEvent.m_label = pRecord->m_vRecord.pszTree;
vEvent.m_editCancelled = FALSE; vEvent.m_editCancelled = false;
} }
break; break;
@@ -2066,11 +2098,11 @@ MRESULT wxTreeCtrl::OS2WindowProc (
vEvent.m_label = pRecord->m_vRecord.pszTree; vEvent.m_label = pRecord->m_vRecord.pszTree;
if (pRecord->m_vRecord.pszTree == NULL) if (pRecord->m_vRecord.pszTree == NULL)
{ {
vEvent.m_editCancelled = TRUE; vEvent.m_editCancelled = true;
} }
else else
{ {
vEvent.m_editCancelled = FALSE; vEvent.m_editCancelled = false;
} }
} }
break; break;