Revert all wxNOEXCEPT-related changes.
This reverts r72978, 72984, 72989 and 72992. Do not use wxNOEXCEPT for wxTextCtrl dtor as this breaks compilation of any user-defined classes inheriting from it unless they use wxNOEXCEPT as well and the benefits (fixing a harmless warning for the niche ICC compiler) are just not worth the compatibility breakage. See #14826. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -43,7 +43,7 @@ public:
|
||||
const wxSize& size = wxDefaultSize, long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxTextCtrlNameStr);
|
||||
virtual ~wxTextCtrl() wxNOEXCEPT;
|
||||
virtual ~wxTextCtrl();
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
// Cocoa specifics
|
||||
|
@@ -3335,17 +3335,6 @@ typedef const void* WXWidget;
|
||||
#define DECLARE_NO_ASSIGN_CLASS(classname) \
|
||||
wxDECLARE_NO_ASSIGN_CLASS(classname);
|
||||
|
||||
/* Macro that can be used to indicate that a function doesn't throw. */
|
||||
#if defined(__cplusplus) && __cplusplus >= 199711L /* C++98 */
|
||||
# if __cplusplus >= 201103L /* >= C++11 */
|
||||
# define wxNOEXCEPT noexcept
|
||||
# else
|
||||
# define wxNOEXCEPT throw()
|
||||
# endif
|
||||
#else
|
||||
# define wxNOEXCEPT
|
||||
#endif
|
||||
|
||||
/* --------------------------------------------------------------------------- */
|
||||
/* If a manifest is being automatically generated, add common controls 6 to it */
|
||||
/* --------------------------------------------------------------------------- */
|
||||
|
@@ -30,7 +30,7 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString &name = wxTextCtrlNameStr);
|
||||
|
||||
virtual ~wxTextCtrl() wxNOEXCEPT;
|
||||
virtual ~wxTextCtrl();
|
||||
|
||||
bool Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
|
@@ -28,7 +28,7 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString &name = wxTextCtrlNameStr);
|
||||
|
||||
virtual ~wxTextCtrl() wxNOEXCEPT;
|
||||
virtual ~wxTextCtrl();
|
||||
|
||||
bool Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
|
@@ -31,7 +31,7 @@ public:
|
||||
|
||||
Create(parent, id, value, pos, size, style, validator, name);
|
||||
}
|
||||
virtual ~wxTextCtrl() wxNOEXCEPT;
|
||||
virtual ~wxTextCtrl();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id,
|
||||
const wxString& value = wxEmptyString,
|
||||
|
@@ -30,7 +30,7 @@ public:
|
||||
{
|
||||
Create(pParent, vId, rsValue, rPos, rSize, lStyle, rValidator, rsName);
|
||||
}
|
||||
virtual ~wxTextCtrl() wxNOEXCEPT;
|
||||
virtual ~wxTextCtrl();
|
||||
|
||||
bool Create( wxWindow* pParent
|
||||
,wxWindowID vId
|
||||
|
@@ -47,7 +47,7 @@ public:
|
||||
Create(parent, id, value, pos, size, style, validator, name);
|
||||
}
|
||||
|
||||
virtual ~wxTextCtrl() wxNOEXCEPT;
|
||||
virtual ~wxTextCtrl();
|
||||
|
||||
bool Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
|
@@ -28,7 +28,7 @@ class WXDLLIMPEXP_BASE wxStdInputStreamBuffer : public std::streambuf
|
||||
{
|
||||
public:
|
||||
wxStdInputStreamBuffer(wxInputStream& stream);
|
||||
virtual ~wxStdInputStreamBuffer() wxNOEXCEPT { }
|
||||
virtual ~wxStdInputStreamBuffer() { }
|
||||
|
||||
protected:
|
||||
virtual std::streambuf *setbuf(char *s, std::streamsize n);
|
||||
@@ -71,7 +71,7 @@ class WXDLLIMPEXP_BASE wxStdInputStream : public std::istream
|
||||
{
|
||||
public:
|
||||
wxStdInputStream(wxInputStream& stream);
|
||||
virtual ~wxStdInputStream() wxNOEXCEPT { }
|
||||
virtual ~wxStdInputStream() { }
|
||||
|
||||
protected:
|
||||
wxStdInputStreamBuffer m_streamBuffer;
|
||||
@@ -85,7 +85,7 @@ class WXDLLIMPEXP_BASE wxStdOutputStreamBuffer : public std::streambuf
|
||||
{
|
||||
public:
|
||||
wxStdOutputStreamBuffer(wxOutputStream& stream);
|
||||
virtual ~wxStdOutputStreamBuffer() wxNOEXCEPT { }
|
||||
virtual ~wxStdOutputStreamBuffer() { }
|
||||
|
||||
protected:
|
||||
virtual std::streambuf *setbuf(char *s, std::streamsize n);
|
||||
@@ -112,7 +112,7 @@ class WXDLLIMPEXP_BASE wxStdOutputStream : public std::ostream
|
||||
{
|
||||
public:
|
||||
wxStdOutputStream(wxOutputStream& stream);
|
||||
virtual ~wxStdOutputStream() wxNOEXCEPT { }
|
||||
virtual ~wxStdOutputStream() { }
|
||||
|
||||
protected:
|
||||
wxStdOutputStreamBuffer m_streamBuffer;
|
||||
|
@@ -679,7 +679,7 @@ public:
|
||||
// --------
|
||||
|
||||
wxTextCtrlBase() { }
|
||||
virtual ~wxTextCtrlBase() wxNOEXCEPT { }
|
||||
virtual ~wxTextCtrlBase() { }
|
||||
|
||||
|
||||
// more readable flag testing methods
|
||||
|
@@ -99,7 +99,7 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxTextCtrlNameStr);
|
||||
|
||||
virtual ~wxTextCtrl() wxNOEXCEPT;
|
||||
virtual ~wxTextCtrl();
|
||||
|
||||
// implement base class pure virtuals
|
||||
// ----------------------------------
|
||||
|
@@ -96,7 +96,7 @@ public:
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString &name = wxTextCtrlNameStr);
|
||||
virtual ~wxTextCtrl() wxNOEXCEPT;
|
||||
virtual ~wxTextCtrl();
|
||||
|
||||
bool Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
|
Reference in New Issue
Block a user