minor WXWIN_COMPATIBILITY_2_2 fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index b3476b77a969b078578da7d6e5f8809b7ad95532..e2ef39df3678a4f8e0b91264ef4593a9815df44e 100644 (file)
--- 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 0304b786603dabedb400da710d896023e0a09bc5..705efe38dfab4702b7892a84d6890849999fed57 100644 (file)
--- 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 aa7950a3e13d339dbdd578d6e0e97caa627c267c..4f50a83b658110ef873c4f0ded9c01d7d5af4fae 100644 (file)
--- 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__)