Removed WXWIN_COMPATIBILITY_2_2 together with code guarded by it.
Changed default for WXWIN_COMPATIBILITY_2_4 to 0. Added WXWIN_COMPATIBILITY_2_6 (defaults to 1). Ran build/update-setup-h. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
92b0cd9eb0
commit
dee1a63ff5
59 changed files with 990 additions and 1678 deletions
|
|
@ -134,12 +134,6 @@ public:
|
|||
bool HasClientUntypedData() const
|
||||
{ return m_clientDataItemsType == wxClientData_Void; }
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_2
|
||||
// compatibility - these functions are deprecated, use the new ones
|
||||
// instead
|
||||
wxDEPRECATED( int Number() const );
|
||||
#endif // WXWIN_COMPATIBILITY_2_2
|
||||
|
||||
protected:
|
||||
virtual int DoAppend(const wxString& item) = 0;
|
||||
virtual int DoInsert(const wxString& item, int pos) = 0;
|
||||
|
|
@ -211,15 +205,6 @@ private:
|
|||
// inline functions
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_2
|
||||
|
||||
inline int wxItemContainer::Number() const
|
||||
{
|
||||
return GetCount();
|
||||
}
|
||||
|
||||
#endif // WXWIN_COMPATIBILITY_2_2
|
||||
|
||||
#endif // wxUSE_CONTROLS
|
||||
|
||||
#endif // _WX_CTRLSUB_H_BASE_
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue