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

Old API clearly deprecated. Source cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-01-06 12:41:27 +00:00
parent 39caed1f6d
commit b4efc9b931
8 changed files with 146 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/gtk/radiobox.h
View File

@@ -97,17 +97,16 @@ public:
// for compatibility only, don't use these methods in new code!
#if WXWIN_COMPATIBILITY_2_2
int Number() const { return GetCount(); }
wxString GetLabel(int n) const { return GetString(n); }
void SetLabel( int item, const wxString& label )
{ SetString(item, label); }
wxDEPRECATED( int Number() const );
wxDEPRECATED( wxString GetLabel(int n) const );
wxDEPRECATED( void SetLabel( int item, const wxString& label ) );
#endif // WXWIN_COMPATIBILITY_2_2
// we have to override those to avoid virtual function name hiding
virtual wxString GetLabel() const { return wxControl::GetLabel(); }
virtual void SetLabel( const wxString& label );
virtual bool Show( bool show = TRUE );
virtual bool Enable( bool enable = TRUE );
virtual bool Show( bool show = true );
virtual bool Enable( bool enable = true );
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

11
include/wx/gtk1/radiobox.h
View File

@@ -97,17 +97,16 @@ public:
// for compatibility only, don't use these methods in new code!
#if WXWIN_COMPATIBILITY_2_2
int Number() const { return GetCount(); }
wxString GetLabel(int n) const { return GetString(n); }
void SetLabel( int item, const wxString& label )
{ SetString(item, label); }
wxDEPRECATED( int Number() const );
wxDEPRECATED( wxString GetLabel(int n) const );
wxDEPRECATED( void SetLabel( int item, const wxString& label ) );
#endif // WXWIN_COMPATIBILITY_2_2
// we have to override those to avoid virtual function name hiding
virtual wxString GetLabel() const { return wxControl::GetLabel(); }
virtual void SetLabel( const wxString& label );
virtual bool Show( bool show = TRUE );
virtual bool Enable( bool enable = TRUE );
virtual bool Show( bool show = true );
virtual bool Enable( bool enable = true );
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

6
include/wx/radiobox.h
View File

@@ -97,9 +97,9 @@ public:
// for compatibility only, don't use these methods in new code!
#if WXWIN_COMPATIBILITY_2_2
int Number() const { return GetCount(); }
wxString GetLabel(int n) const { return GetString(n); }
void SetLabel(int n, const wxString& label) { SetString(n, label); }
wxDEPRECATED( int Number() const );
wxDEPRECATED( wxString GetLabel(int n) const );
wxDEPRECATED( void SetLabel(int n, const wxString& label) );
#endif // WXWIN_COMPATIBILITY_2_2
};

8
include/wx/tbarbase.h
View File

@@ -200,11 +200,11 @@ public:
// compatibility only, don't use
#if WXWIN_COMPATIBILITY_2_2
const wxBitmap& GetBitmap1() const { return GetNormalBitmap(); }
const wxBitmap& GetBitmap2() const { return GetDisabledBitmap(); }
wxDEPRECATED( const wxBitmap& GetBitmap1() const );
wxDEPRECATED( const wxBitmap& GetBitmap2() const );
void SetBitmap1(const wxBitmap& bmp) { SetNormalBitmap(bmp); }
void SetBitmap2(const wxBitmap& bmp) { SetDisabledBitmap(bmp); }
wxDEPRECATED( void SetBitmap1(const wxBitmap& bmp) );
wxDEPRECATED( void SetBitmap2(const wxBitmap& bmp) );
#endif // WXWIN_COMPATIBILITY_2_2
protected: