From 62e2654261961f74b79a9581bd7c882f20acebde Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 2 Jul 2001 09:38:35 +0000
Subject: [PATCH] minor WXWIN_COMPATIBILITY_2_2 fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/ctrlsub.h  | 4 ++--
 include/wx/defs.h     | 3 +++
 include/wx/radiobox.h | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index b3476b77a9..e2ef39df36 100644
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -80,11 +80,11 @@ public:
     bool HasClientUntypedData() const
         { return m_clientDataItemsType == wxClientData_Void; }
 
-#if WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2_2
     // compatibility - these functions are deprecated, use the new ones
     // instead
     int Number() const { return GetCount(); }
-#endif // WXWIN_COMPATIBILITY_2
+#endif // WXWIN_COMPATIBILITY_2_2
 
 #ifdef __WXMAC_X__
     virtual ~wxItemContainer() {}  // Added min for Mac X
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 0304b78660..705efe38df 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -300,7 +300,10 @@
 // compatibility code
 #if !wxUSE_GUI
     #undef WXWIN_COMPATIBILITY_2
+    #undef WXWIN_COMPATIBILITY_2_2
+
     #define WXWIN_COMPATIBILITY_2 0
+    #define WXWIN_COMPATIBILITY_2_2 0
 #endif // !GUI
 
 // ============================================================================
diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index aa7950a3e1..4f50a83b65 100644
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -87,11 +87,11 @@ public:
     int GetNextItem(int item, wxDirection dir, long style) const;
 
     // 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(); }
     wxString GetLabel(int n) const { return GetString(n); }
     void SetLabel(int n, const wxString& label) { SetString(n, label); }
-#endif // WXWIN_COMPATIBILITY_2
+#endif // WXWIN_COMPATIBILITY_2_2
 };
 
 #if defined(__WXUNIVERSAL__)
-- 
2.45.2