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

minor WXWIN_COMPATIBILITY_2_2 fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-02 09:38:35 +00:00
parent 463abc6470
commit 62e2654261
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/ctrlsub.h
View File

@@ -80,11 +80,11 @@ public:
bool HasClientUntypedData() const bool HasClientUntypedData() const
{ return m_clientDataItemsType == wxClientData_Void; } { return m_clientDataItemsType == wxClientData_Void; }
#if WXWIN_COMPATIBILITY_2 #if WXWIN_COMPATIBILITY_2_2
// compatibility - these functions are deprecated, use the new ones // compatibility - these functions are deprecated, use the new ones
// instead // instead
int Number() const { return GetCount(); } int Number() const { return GetCount(); }
#endif // WXWIN_COMPATIBILITY_2 #endif // WXWIN_COMPATIBILITY_2_2
#ifdef __WXMAC_X__ #ifdef __WXMAC_X__
virtual ~wxItemContainer() {} // Added min for Mac X virtual ~wxItemContainer() {} // Added min for Mac X

3
include/wx/defs.h
View File

@@ -300,7 +300,10 @@
// compatibility code // compatibility code
#if !wxUSE_GUI #if !wxUSE_GUI
#undef WXWIN_COMPATIBILITY_2 #undef WXWIN_COMPATIBILITY_2
#undef WXWIN_COMPATIBILITY_2_2
#define WXWIN_COMPATIBILITY_2 0 #define WXWIN_COMPATIBILITY_2 0
#define WXWIN_COMPATIBILITY_2_2 0
#endif // !GUI #endif // !GUI
// ============================================================================ // ============================================================================

4
include/wx/radiobox.h
View File

@@ -87,11 +87,11 @@ public:
int GetNextItem(int item, wxDirection dir, long style) const; int GetNextItem(int item, wxDirection dir, long style) const;
// for compatibility only, don't use these methods in new code! // for compatibility only, don't use these methods in new code!
#ifdef WXWIN_COMPATIBILITY_2 #ifdef WXWIN_COMPATIBILITY_2_2
int Number() const { return GetCount(); } int Number() const { return GetCount(); }
wxString GetLabel(int n) const { return GetString(n); } wxString GetLabel(int n) const { return GetString(n); }
void SetLabel(int n, const wxString& label) { SetString(n, label); } void SetLabel(int n, const wxString& label) { SetString(n, label); }
#endif // WXWIN_COMPATIBILITY_2 #endif // WXWIN_COMPATIBILITY_2_2
}; };
#if defined(__WXUNIVERSAL__) #if defined(__WXUNIVERSAL__)