corrected WXWIN_COMPATIBILITY conditional tests

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

diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h
index fcd13f46bd630864f3a8964c933b87044c548c77..c1f264b3bb03132510a7f09b3f32552caf981105 100644 (file)
--- a/include/wx/generic/choicdgg.h
+++ b/include/wx/generic/choicdgg.h
@@ -105,7 +105,7 @@ public:
     void OnListBoxDClick(wxCommandEvent& event);
 
     // old, deprecated methods
-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2
     wxSingleChoiceDialog(wxWindow *parent,
                          const wxString& message,
                          const wxString& caption,
@@ -271,7 +271,7 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
 // deprecated
 // ----------------------------------------------------------------------------
 
-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2
 
 WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
                                        const wxString& caption,

diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index d687b59e415c7306d34a67f9c0c4d7c668ec6d27..0ef5e77cf84c25ea0bd706b22c6dac86de323533 100644 (file)
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -117,7 +117,7 @@ public:
                  const wxString& wildcard = wxEmptyString,
                  bool details = FALSE);
 
-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2
     // deprecated
     wxList *GetList(const wxString& wildcard, bool details = FALSE);
 #endif // WXWIN_COMPATIBILITY_2

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index 4f50a83b658110ef873c4f0ded9c01d7d5af4fae..33924706a48bd2b1a081d5c94923c04adfcdf3da 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -87,7 +87,7 @@ 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_2
+#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); }

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 1579342ca58ab63ec7f75be95635880a74bc1912..5a815e21c895b312d55e5ec63dfef2f611c0409d 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -884,7 +884,7 @@ int wxFTP::GetFileSize(const wxString& fileName)
 }
 
 
-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2
 // deprecated
 wxList *wxFTP::GetList(const wxString& wildcard, bool details)
 {

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index f97e674d19d0181b9a4457e7e6ae46d2cf42d414..a23450cfe4ab923cd5bc458967a3e671dfe4ab5d 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -129,7 +129,7 @@ wxString wxGetSingleChoice( const wxString& message,
     return res;
 }
 
-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2
 // Overloaded for backward compatibility
 wxString wxGetSingleChoice( const wxString& message,
                             const wxString& caption,
@@ -186,7 +186,7 @@ int wxGetSingleChoiceIndex( const wxString& message,
     return res;
 }
 
-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2
 // Overloaded for backward compatibility
 int wxGetSingleChoiceIndex( const wxString& message,
                             const wxString& caption,
@@ -244,7 +244,7 @@ void *wxGetSingleChoiceData( const wxString& message,
     return res;
 }
 
-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2
 // Overloaded for backward compatibility
 void *wxGetSingleChoiceData( const wxString& message,
                              const wxString& caption,
@@ -384,7 +384,7 @@ wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
     Create(parent, message, caption, n, choices, clientData, style);
 }
 
-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2
 
 wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
                                            const wxString& message,