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

Better backward compatibility and deprecation markup for interface deprecated in comments.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-31 11:13:03 +00:00
parent 4521d1cdda
commit 6a9e54bdff
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/sizer.h
View File

@@ -229,9 +229,11 @@ public:
bool IsSizer() const { return m_kind == Item_Sizer; } bool IsSizer() const { return m_kind == Item_Sizer; }
bool IsSpacer() const { return m_kind == Item_Spacer; } bool IsSpacer() const { return m_kind == Item_Spacer; }
#if WXWIN_COMPATIBILITY_2_6
// Deprecated in 2.6, use {G,S}etProportion instead. // Deprecated in 2.6, use {G,S}etProportion instead.
wxDEPRECATED( void SetOption( int option ) ); wxDEPRECATED( void SetOption( int option ) );
wxDEPRECATED( int GetOption() const ); wxDEPRECATED( int GetOption() const );
#endif // WXWIN_COMPATIBILITY_2_6
void SetProportion( int proportion ) void SetProportion( int proportion )
{ m_proportion = proportion; } { m_proportion = proportion; }
@@ -409,9 +411,12 @@ public:
inline wxSizerItem* PrependStretchSpacer(int prop = 1); inline wxSizerItem* PrependStretchSpacer(int prop = 1);
#if WXWIN_COMPATIBILITY_2_6
// Deprecated in 2.6 since historically it does not delete the window, // Deprecated in 2.6 since historically it does not delete the window,
// use Detach instead. // use Detach instead.
wxDEPRECATED( virtual bool Remove( wxWindow *window ) ); wxDEPRECATED( virtual bool Remove( wxWindow *window ) );
#endif // WXWIN_COMPATIBILITY_2_6
virtual bool Remove( wxSizer *sizer ); virtual bool Remove( wxSizer *sizer );
virtual bool Remove( int index ); virtual bool Remove( int index );
@@ -765,7 +770,9 @@ class WXDLLEXPORT wxBookCtrlBase;
class WXDLLEXPORT wxBookCtrlSizer : public wxSizer class WXDLLEXPORT wxBookCtrlSizer : public wxSizer
{ {
public: public:
#if WXWIN_COMPATIBILITY_2_6
wxDEPRECATED( wxBookCtrlSizer(wxBookCtrlBase *bookctrl) ); wxDEPRECATED( wxBookCtrlSizer(wxBookCtrlBase *bookctrl) );
#endif // WXWIN_COMPATIBILITY_2_6
wxBookCtrlBase *GetControl() const { return m_bookctrl; } wxBookCtrlBase *GetControl() const { return m_bookctrl; }
@@ -794,7 +801,9 @@ class WXDLLEXPORT wxNotebook;
class WXDLLEXPORT wxNotebookSizer : public wxBookCtrlSizer class WXDLLEXPORT wxNotebookSizer : public wxBookCtrlSizer
{ {
public: public:
#if WXWIN_COMPATIBILITY_2_6
wxDEPRECATED( wxNotebookSizer(wxNotebook *nb) ); wxDEPRECATED( wxNotebookSizer(wxNotebook *nb) );
#endif // WXWIN_COMPATIBILITY_2_6
wxNotebook *GetNotebook() const { return (wxNotebook *)m_bookctrl; } wxNotebook *GetNotebook() const { return (wxNotebook *)m_bookctrl; }