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

corrected WXWIN_COMPATIBILITY conditional tests

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-07-07 11:23:24 +00:00
parent 4c41981b8e
commit 1d79bd3eaf
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/generic/choicdgg.h
View File

@@ -105,7 +105,7 @@ public:
void OnListBoxDClick(wxCommandEvent& event); void OnListBoxDClick(wxCommandEvent& event);
// old, deprecated methods // old, deprecated methods
#ifdef WXWIN_COMPATIBILITY_2 #if WXWIN_COMPATIBILITY_2
wxSingleChoiceDialog(wxWindow *parent, wxSingleChoiceDialog(wxWindow *parent,
const wxString& message, const wxString& message,
const wxString& caption, const wxString& caption,
@@ -271,7 +271,7 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
// deprecated // deprecated
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifdef WXWIN_COMPATIBILITY_2 #if WXWIN_COMPATIBILITY_2
WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
const wxString& caption, const wxString& caption,

2
include/wx/protocol/ftp.h
View File

@@ -117,7 +117,7 @@ public:
const wxString& wildcard = wxEmptyString, const wxString& wildcard = wxEmptyString,
bool details = FALSE); bool details = FALSE);
#ifdef WXWIN_COMPATIBILITY_2 #if WXWIN_COMPATIBILITY_2
// deprecated // deprecated
wxList *GetList(const wxString& wildcard, bool details = FALSE); wxList *GetList(const wxString& wildcard, bool details = FALSE);
#endif // WXWIN_COMPATIBILITY_2 #endif // WXWIN_COMPATIBILITY_2

2
include/wx/radiobox.h
View File

@@ -87,7 +87,7 @@ 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_2 #if 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); }

2
src/common/ftp.cpp
View File

@@ -884,7 +884,7 @@ int wxFTP::GetFileSize(const wxString& fileName)
} }
#ifdef WXWIN_COMPATIBILITY_2 #if WXWIN_COMPATIBILITY_2
// deprecated // deprecated
wxList *wxFTP::GetList(const wxString& wildcard, bool details) wxList *wxFTP::GetList(const wxString& wildcard, bool details)
{ {

8
src/generic/choicdgg.cpp
View File

@@ -129,7 +129,7 @@ wxString wxGetSingleChoice( const wxString& message,
return res; return res;
} }
#ifdef WXWIN_COMPATIBILITY_2 #if WXWIN_COMPATIBILITY_2
// Overloaded for backward compatibility // Overloaded for backward compatibility
wxString wxGetSingleChoice( const wxString& message, wxString wxGetSingleChoice( const wxString& message,
const wxString& caption, const wxString& caption,
@@ -186,7 +186,7 @@ int wxGetSingleChoiceIndex( const wxString& message,
return res; return res;
} }
#ifdef WXWIN_COMPATIBILITY_2 #if WXWIN_COMPATIBILITY_2
// Overloaded for backward compatibility // Overloaded for backward compatibility
int wxGetSingleChoiceIndex( const wxString& message, int wxGetSingleChoiceIndex( const wxString& message,
const wxString& caption, const wxString& caption,
@@ -244,7 +244,7 @@ void *wxGetSingleChoiceData( const wxString& message,
return res; return res;
} }
#ifdef WXWIN_COMPATIBILITY_2 #if WXWIN_COMPATIBILITY_2
// Overloaded for backward compatibility // Overloaded for backward compatibility
void *wxGetSingleChoiceData( const wxString& message, void *wxGetSingleChoiceData( const wxString& message,
const wxString& caption, const wxString& caption,
@@ -384,7 +384,7 @@ wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
Create(parent, message, caption, n, choices, clientData, style); Create(parent, message, caption, n, choices, clientData, style);
} }
#ifdef WXWIN_COMPATIBILITY_2 #if WXWIN_COMPATIBILITY_2
wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent, wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
const wxString& message, const wxString& message,