From 1d79bd3eaf6fe173996b9fc71693891a11dabd96 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Sat, 7 Jul 2001 11:23:24 +0000 Subject: [PATCH] corrected WXWIN_COMPATIBILITY conditional tests git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/choicdgg.h | 4 ++-- include/wx/protocol/ftp.h | 2 +- include/wx/radiobox.h | 2 +- src/common/ftp.cpp | 2 +- src/generic/choicdgg.cpp | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h index fcd13f46bd..c1f264b3bb 100644 --- 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 d687b59e41..0ef5e77cf8 100644 --- 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 4f50a83b65..33924706a4 100644 --- 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 1579342ca5..5a815e21c8 100644 --- 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 f97e674d19..a23450cfe4 100644 --- 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, -- 2.45.2