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:
@@ -550,7 +550,6 @@ All:
|
|||||||
- Add wxFile::ReadAll() for consistency with wxFFile.
|
- Add wxFile::ReadAll() for consistency with wxFFile.
|
||||||
- Add wxDateTime::DiffAsDateSpan() and wxDateSpan::GetTotalMonths() (jonasr).
|
- Add wxDateTime::DiffAsDateSpan() and wxDateSpan::GetTotalMonths() (jonasr).
|
||||||
- Add wxVector::assign() (Jonas Rydberg).
|
- Add wxVector::assign() (Jonas Rydberg).
|
||||||
- Add wxNOEXCEPT (Marian VooDooMan Meravy).
|
|
||||||
- Added Nepali translation (Him Prasad Gautam).
|
- Added Nepali translation (Him Prasad Gautam).
|
||||||
|
|
||||||
All (GUI):
|
All (GUI):
|
||||||
|
@@ -43,7 +43,7 @@ public:
|
|||||||
const wxSize& size = wxDefaultSize, long style = 0,
|
const wxSize& size = wxDefaultSize, long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxTextCtrlNameStr);
|
const wxString& name = wxTextCtrlNameStr);
|
||||||
virtual ~wxTextCtrl() wxNOEXCEPT;
|
virtual ~wxTextCtrl();
|
||||||
|
|
||||||
// ------------------------------------------------------------------------
|
// ------------------------------------------------------------------------
|
||||||
// Cocoa specifics
|
// Cocoa specifics
|
||||||
|
@@ -3335,17 +3335,6 @@ typedef const void* WXWidget;
|
|||||||
#define DECLARE_NO_ASSIGN_CLASS(classname) \
|
#define DECLARE_NO_ASSIGN_CLASS(classname) \
|
||||||
wxDECLARE_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 */
|
/* If a manifest is being automatically generated, add common controls 6 to it */
|
||||||
/* --------------------------------------------------------------------------- */
|
/* --------------------------------------------------------------------------- */
|
||||||
|
@@ -30,7 +30,7 @@ public:
|
|||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString &name = wxTextCtrlNameStr);
|
const wxString &name = wxTextCtrlNameStr);
|
||||||
|
|
||||||
virtual ~wxTextCtrl() wxNOEXCEPT;
|
virtual ~wxTextCtrl();
|
||||||
|
|
||||||
bool Create(wxWindow *parent,
|
bool Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
|
@@ -28,7 +28,7 @@ public:
|
|||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString &name = wxTextCtrlNameStr);
|
const wxString &name = wxTextCtrlNameStr);
|
||||||
|
|
||||||
virtual ~wxTextCtrl() wxNOEXCEPT;
|
virtual ~wxTextCtrl();
|
||||||
|
|
||||||
bool Create(wxWindow *parent,
|
bool Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
|
@@ -31,7 +31,7 @@ public:
|
|||||||
|
|
||||||
Create(parent, id, value, pos, size, style, validator, name);
|
Create(parent, id, value, pos, size, style, validator, name);
|
||||||
}
|
}
|
||||||
virtual ~wxTextCtrl() wxNOEXCEPT;
|
virtual ~wxTextCtrl();
|
||||||
|
|
||||||
bool Create(wxWindow *parent, wxWindowID id,
|
bool Create(wxWindow *parent, wxWindowID id,
|
||||||
const wxString& value = wxEmptyString,
|
const wxString& value = wxEmptyString,
|
||||||
|
@@ -30,7 +30,7 @@ public:
|
|||||||
{
|
{
|
||||||
Create(pParent, vId, rsValue, rPos, rSize, lStyle, rValidator, rsName);
|
Create(pParent, vId, rsValue, rPos, rSize, lStyle, rValidator, rsName);
|
||||||
}
|
}
|
||||||
virtual ~wxTextCtrl() wxNOEXCEPT;
|
virtual ~wxTextCtrl();
|
||||||
|
|
||||||
bool Create( wxWindow* pParent
|
bool Create( wxWindow* pParent
|
||||||
,wxWindowID vId
|
,wxWindowID vId
|
||||||
|
@@ -47,7 +47,7 @@ public:
|
|||||||
Create(parent, id, value, pos, size, style, validator, name);
|
Create(parent, id, value, pos, size, style, validator, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual ~wxTextCtrl() wxNOEXCEPT;
|
virtual ~wxTextCtrl();
|
||||||
|
|
||||||
bool Create(wxWindow *parent,
|
bool Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
|
@@ -28,7 +28,7 @@ class WXDLLIMPEXP_BASE wxStdInputStreamBuffer : public std::streambuf
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxStdInputStreamBuffer(wxInputStream& stream);
|
wxStdInputStreamBuffer(wxInputStream& stream);
|
||||||
virtual ~wxStdInputStreamBuffer() wxNOEXCEPT { }
|
virtual ~wxStdInputStreamBuffer() { }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual std::streambuf *setbuf(char *s, std::streamsize n);
|
virtual std::streambuf *setbuf(char *s, std::streamsize n);
|
||||||
@@ -71,7 +71,7 @@ class WXDLLIMPEXP_BASE wxStdInputStream : public std::istream
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxStdInputStream(wxInputStream& stream);
|
wxStdInputStream(wxInputStream& stream);
|
||||||
virtual ~wxStdInputStream() wxNOEXCEPT { }
|
virtual ~wxStdInputStream() { }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
wxStdInputStreamBuffer m_streamBuffer;
|
wxStdInputStreamBuffer m_streamBuffer;
|
||||||
@@ -85,7 +85,7 @@ class WXDLLIMPEXP_BASE wxStdOutputStreamBuffer : public std::streambuf
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxStdOutputStreamBuffer(wxOutputStream& stream);
|
wxStdOutputStreamBuffer(wxOutputStream& stream);
|
||||||
virtual ~wxStdOutputStreamBuffer() wxNOEXCEPT { }
|
virtual ~wxStdOutputStreamBuffer() { }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual std::streambuf *setbuf(char *s, std::streamsize n);
|
virtual std::streambuf *setbuf(char *s, std::streamsize n);
|
||||||
@@ -112,7 +112,7 @@ class WXDLLIMPEXP_BASE wxStdOutputStream : public std::ostream
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxStdOutputStream(wxOutputStream& stream);
|
wxStdOutputStream(wxOutputStream& stream);
|
||||||
virtual ~wxStdOutputStream() wxNOEXCEPT { }
|
virtual ~wxStdOutputStream() { }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
wxStdOutputStreamBuffer m_streamBuffer;
|
wxStdOutputStreamBuffer m_streamBuffer;
|
||||||
|
@@ -679,7 +679,7 @@ public:
|
|||||||
// --------
|
// --------
|
||||||
|
|
||||||
wxTextCtrlBase() { }
|
wxTextCtrlBase() { }
|
||||||
virtual ~wxTextCtrlBase() wxNOEXCEPT { }
|
virtual ~wxTextCtrlBase() { }
|
||||||
|
|
||||||
|
|
||||||
// more readable flag testing methods
|
// more readable flag testing methods
|
||||||
|
@@ -99,7 +99,7 @@ public:
|
|||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxTextCtrlNameStr);
|
const wxString& name = wxTextCtrlNameStr);
|
||||||
|
|
||||||
virtual ~wxTextCtrl() wxNOEXCEPT;
|
virtual ~wxTextCtrl();
|
||||||
|
|
||||||
// implement base class pure virtuals
|
// implement base class pure virtuals
|
||||||
// ----------------------------------
|
// ----------------------------------
|
||||||
|
@@ -96,7 +96,7 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString &name = wxTextCtrlNameStr);
|
const wxString &name = wxTextCtrlNameStr);
|
||||||
virtual ~wxTextCtrl() wxNOEXCEPT;
|
virtual ~wxTextCtrl();
|
||||||
|
|
||||||
bool Create(wxWindow *parent,
|
bool Create(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
|
@@ -1725,22 +1725,6 @@ template <typename T> wxSwap(T& first, T& second);
|
|||||||
*/
|
*/
|
||||||
void wxVaCopy(va_list argptrDst, va_list argptrSrc);
|
void wxVaCopy(va_list argptrDst, va_list argptrSrc);
|
||||||
|
|
||||||
/**
|
|
||||||
Macro that can be used to indicate that a function doesn't throw any
|
|
||||||
exceptions.
|
|
||||||
|
|
||||||
This macro expands to `noexcept` when using C++11 compiler or `throw()` for
|
|
||||||
older C++ compilers or nothing when used with a C++ compiler too old to
|
|
||||||
support even this.
|
|
||||||
|
|
||||||
Notice that `noexcept` and `throw()` have different semantics in case an
|
|
||||||
exception @e is thrown, so this macro should be used only if you don't rely
|
|
||||||
on the behaviour provided by the latter but not the former.
|
|
||||||
|
|
||||||
@since 2.9.5
|
|
||||||
*/
|
|
||||||
#define wxNOEXCEPT
|
|
||||||
|
|
||||||
//@}
|
//@}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -940,7 +940,7 @@ class wxComboCtrlTextCtrl : public wxTextCtrl
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxComboCtrlTextCtrl() : wxTextCtrl() { }
|
wxComboCtrlTextCtrl() : wxTextCtrl() { }
|
||||||
virtual ~wxComboCtrlTextCtrl() wxNOEXCEPT { }
|
virtual ~wxComboCtrlTextCtrl() { }
|
||||||
|
|
||||||
virtual wxWindow *GetMainWindowOfCompositeControl()
|
virtual wxWindow *GetMainWindowOfCompositeControl()
|
||||||
{
|
{
|
||||||
|
@@ -77,7 +77,7 @@ public:
|
|||||||
SetSizeHints(wxDefaultCoord, wxDefaultCoord);
|
SetSizeHints(wxDefaultCoord, wxDefaultCoord);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual ~wxSpinCtrlTextGeneric() wxNOEXCEPT
|
virtual ~wxSpinCtrlTextGeneric()
|
||||||
{
|
{
|
||||||
// MSW sends extra kill focus event on destroy
|
// MSW sends extra kill focus event on destroy
|
||||||
if (m_spin)
|
if (m_spin)
|
||||||
|
@@ -95,8 +95,6 @@ class WXDLLEXPORT wxTreeTextCtrl: public wxTextCtrl
|
|||||||
public:
|
public:
|
||||||
wxTreeTextCtrl(wxGenericTreeCtrl *owner, wxGenericTreeItem *item);
|
wxTreeTextCtrl(wxGenericTreeCtrl *owner, wxGenericTreeItem *item);
|
||||||
|
|
||||||
virtual ~wxTreeTextCtrl() wxNOEXCEPT {}
|
|
||||||
|
|
||||||
void EndEdit( bool discardChanges );
|
void EndEdit( bool discardChanges );
|
||||||
|
|
||||||
const wxGenericTreeItem* item() const { return m_itemEdited; }
|
const wxGenericTreeItem* item() const { return m_itemEdited; }
|
||||||
|
@@ -610,7 +610,7 @@ void wxTextCtrl::Init()
|
|||||||
m_anonymousMarkList = NULL;
|
m_anonymousMarkList = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxTextCtrl::~wxTextCtrl() wxNOEXCEPT
|
wxTextCtrl::~wxTextCtrl()
|
||||||
{
|
{
|
||||||
if (m_text)
|
if (m_text)
|
||||||
GTKDisconnect(m_text);
|
GTKDisconnect(m_text);
|
||||||
|
@@ -226,7 +226,7 @@ void wxTextCtrl::Init()
|
|||||||
m_vScrollbar = NULL;
|
m_vScrollbar = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxTextCtrl::~wxTextCtrl() wxNOEXCEPT
|
wxTextCtrl::~wxTextCtrl()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -229,7 +229,7 @@ void wxTextCtrl::Init()
|
|||||||
m_isNativeCaretShown = true;
|
m_isNativeCaretShown = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxTextCtrl::~wxTextCtrl() wxNOEXCEPT
|
wxTextCtrl::~wxTextCtrl()
|
||||||
{
|
{
|
||||||
#if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
|
#if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
|
||||||
if ( m_dropTarget == wxRICHTEXT_DEFAULT_DROPTARGET )
|
if ( m_dropTarget == wxRICHTEXT_DEFAULT_DROPTARGET )
|
||||||
|
@@ -764,7 +764,7 @@ bool wxTextCtrl::Create(wxWindow *parent,
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxTextCtrl::~wxTextCtrl() wxNOEXCEPT
|
wxTextCtrl::~wxTextCtrl()
|
||||||
{
|
{
|
||||||
delete m_cmdProcessor;
|
delete m_cmdProcessor;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user