From a6fb8636e551162537ac094da81bafa5ee7fdf83 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 11 Jan 2005 21:17:16 +0000 Subject: [PATCH] Old API deprecated. Source cleaning. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/treectlg.h | 8 ++--- include/wx/msw/treectrl.h | 10 +++--- include/wx/os2/treectrl.h | 13 +++----- include/wx/url.h | 6 ++-- src/common/uri.cpp | 15 +++++++++ src/generic/treectlg.cpp | 16 ++++++++- src/msw/treectrl.cpp | 22 +++++++++++++ src/os2/treectrl.cpp | 62 ++++++++++++++++++++++++++--------- 8 files changed, 114 insertions(+), 38 deletions(-) diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h index 82dcaa849d..b4093ccb25 100644 --- a/include/wx/generic/treectlg.h +++ b/include/wx/generic/treectlg.h @@ -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 diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h index 95d587a5d0..21f4d1b744 100644 --- a/include/wx/msw/treectrl.h +++ b/include/wx/msw/treectrl.h @@ -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, diff --git a/include/wx/os2/treectrl.h b/include/wx/os2/treectrl.h index d7f7db8bdb..7c5e19b717 100644 --- a/include/wx/os2/treectrl.h +++ b/include/wx/os2/treectrl.h @@ -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 diff --git a/include/wx/url.h b/include/wx/url.h index 61c2233037..18143b786c 100644 --- a/include/wx/url.h +++ b/include/wx/url.h @@ -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( diff --git a/src/common/uri.cpp b/src/common/uri.cpp index 0d137f5bc1..abc46f49b9 100644 --- a/src/common/uri.cpp +++ b/src/common/uri.cpp @@ -1237,6 +1237,21 @@ bool wxURI::IsDigit(const wxChar& c) #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 //more like a dirty hack than anything else... diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index ed8f47b512..432f8f71d3 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -3088,7 +3088,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event ) // remember the old cursor because we will change it while // dragging m_oldCursor = m_cursor; - + // in a single selection control, hide the selection temporarily if ( !(GetWindowStyleFlag() & wxTR_MULTIPLE) ) { @@ -3563,6 +3563,20 @@ wxGenericTreeCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) #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 wxTreeItemId wxGenericTreeCtrl::GetParent(const wxTreeItemId& item) const diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index 5ae8799053..2a2bb3b124 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -1719,6 +1719,26 @@ wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent, 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 wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text, @@ -1900,10 +1920,12 @@ void wxTreeCtrl::Toggle(const wxTreeItemId& item) } #if WXWIN_COMPATIBILITY_2_4 + void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action) { DoExpand(item, action); } + #endif void wxTreeCtrl::Unselect() diff --git a/src/os2/treectrl.cpp b/src/os2/treectrl.cpp index ba09050661..489dbac9aa 100644 --- a/src/os2/treectrl.cpp +++ b/src/os2/treectrl.cpp @@ -346,9 +346,9 @@ void wxTreeCtrl::Init () { m_pImageListNormal = NULL; m_pImageListState = NULL; - m_bOwnsImageListNormal = FALSE; - m_bOwnsImageListState = FALSE; - m_bHasAnyAttr = FALSE; + m_bOwnsImageListNormal = false; + m_bOwnsImageListState = false; + m_bHasAnyAttr = false; m_pDragImage = NULL; // @@ -440,7 +440,7 @@ wxTreeCtrl::~wxTreeCtrl () { delete (wxTreeItemAttr *)pNode->Data(); } - m_bHasAnyAttr = FALSE; + m_bHasAnyAttr = false; } DeleteTextCtrl(); @@ -544,6 +544,30 @@ wxImageList* wxTreeCtrl::GetImageList () const return m_pImageListNormal; } // 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 { return m_pImageListNormal; @@ -568,7 +592,7 @@ void wxTreeCtrl::SetImageList ( { if (m_bOwnsImageListNormal) delete m_pImageListNormal; - m_bOwnsImageListNormal = FALSE; + m_bOwnsImageListNormal = false; } // end of wxTreeCtrl::SetImageList void wxTreeCtrl::SetStateImageList ( @@ -577,21 +601,21 @@ void wxTreeCtrl::SetStateImageList ( { if (m_bOwnsImageListState) delete m_pImageListState; - m_bOwnsImageListState = FALSE; + m_bOwnsImageListState = false; } // end of wxTreeCtrl::SetStateImageList void wxTreeCtrl::AssignImageList ( wxImageList* WXUNUSED(pImageList) ) { - m_bOwnsImageListNormal = TRUE; + m_bOwnsImageListNormal = true; } // end of wxTreeCtrl::AssignImageList void wxTreeCtrl::AssignStateImageList ( wxImageList* WXUNUSED(pImageList) ) { - m_bOwnsImageListState = TRUE; + m_bOwnsImageListState = true; } // end of wxTreeCtrl::AssignStateImageList size_t wxTreeCtrl::GetChildrenCount ( @@ -974,7 +998,7 @@ void wxTreeCtrl::SetItemTextColour ( , const wxColour& rCol ) { - m_bHasAnyAttr = TRUE; + m_bHasAnyAttr = true; long lId = (long)rItem.m_pItem; wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId); @@ -993,7 +1017,7 @@ void wxTreeCtrl::SetItemBackgroundColour ( , const wxColour& rCol ) { - m_bHasAnyAttr = TRUE; + m_bHasAnyAttr = true; long lId = (long)rItem.m_pItem; wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId); @@ -1012,7 +1036,7 @@ void wxTreeCtrl::SetItemFont ( , const wxFont& rFont ) { - m_bHasAnyAttr = TRUE; + m_bHasAnyAttr = true; long lId = (long)rItem.m_pItem; wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId); @@ -1478,6 +1502,8 @@ wxTreeItemId wxTreeCtrl::DoInsertItem ( return wxTreeItemId((long)pRecord->m_ulItemId); } +#if WXWIN_COMPATIBILITY_2_4 + // for compatibility only wxTreeItemId wxTreeCtrl::InsertItem ( const wxTreeItemId& rParent @@ -1496,6 +1522,8 @@ wxTreeItemId wxTreeCtrl::InsertItem ( ); } // end of wxTreeCtrl::InsertItem +#endif // WXWIN_COMPATIBILITY_2_4 + wxTreeItemId wxTreeCtrl::AddRoot ( const wxString& rsText , int nImage @@ -1736,6 +1764,8 @@ void wxTreeCtrl::Toggle ( ); } // end of wxTreeCtrl::Toggle +#if WXWIN_COMPATIBILITY_2_4 + void wxTreeCtrl::ExpandItem ( const wxTreeItemId& rItem , int nAction @@ -1746,6 +1776,8 @@ void wxTreeCtrl::ExpandItem ( ); } // end of wxTreeCtrl::ExpandItem +#endif // WXWIN_COMPATIBILITY_2_4 + void wxTreeCtrl::Unselect () { wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE), @@ -1767,7 +1799,7 @@ void wxTreeCtrl::UnselectAll () for (size_t n = 0; n < nCount; n++) { SetItemCheck( aSelections[n] - ,FALSE + ,false ); } } @@ -2051,7 +2083,7 @@ MRESULT wxTreeCtrl::OS2WindowProc ( vEventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT; vEvent.m_item = pRecord->m_ulItemId; vEvent.m_label = pRecord->m_vRecord.pszTree; - vEvent.m_editCancelled = FALSE; + vEvent.m_editCancelled = false; } break; @@ -2066,11 +2098,11 @@ MRESULT wxTreeCtrl::OS2WindowProc ( vEvent.m_label = pRecord->m_vRecord.pszTree; if (pRecord->m_vRecord.pszTree == NULL) { - vEvent.m_editCancelled = TRUE; + vEvent.m_editCancelled = true; } else { - vEvent.m_editCancelled = FALSE; + vEvent.m_editCancelled = false; } } break; -- 2.45.2