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

remove WXWIN_COMPATIBILITY_2_6, add WXWIN_COMPATIBILITY_3_0

Browse Source 
closes #15792

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-01-04 20:07:33 +00:00
parent 61728d5d54
commit 967a94c91a
140 changed files with 291 additions and 1561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/sizer.h
View File

@@ -351,12 +351,6 @@ public:
bool IsSizer() const { return m_kind == Item_Sizer; }
bool IsSpacer() const { return m_kind == Item_Spacer; }
#if WXWIN_COMPATIBILITY_2_6
// Deprecated in 2.6, use {G,S}etProportion instead.
wxDEPRECATED( void SetOption( int option ) );
wxDEPRECATED( int GetOption() const );
#endif // WXWIN_COMPATIBILITY_2_6
void SetProportion( int proportion )
{ m_proportion = proportion; }
int GetProportion() const
@@ -591,12 +585,6 @@ public:
void SetContainingWindow(wxWindow *window);
wxWindow *GetContainingWindow() const { return m_containingWindow; }
#if WXWIN_COMPATIBILITY_2_6
// Deprecated in 2.6 since historically it does not delete the window,
// use Detach instead.
wxDEPRECATED( virtual bool Remove( wxWindow *window ) );
#endif // WXWIN_COMPATIBILITY_2_6
virtual bool Remove( wxSizer *sizer );
virtual bool Remove( int index );