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

diff --git a/docs/changes.txt b/docs/changes.txt
index f1dbd24a42f3bc3cc4bad711e48c3ad620ac1f32..ed1b5ad72b6bc95920e4edab1f41eaae53f29922 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -550,7 +550,6 @@ All:
 - Add wxFile::ReadAll() for consistency with wxFFile.
 - Add wxDateTime::DiffAsDateSpan() and wxDateSpan::GetTotalMonths() (jonasr).
 - Add wxVector::assign() (Jonas Rydberg).
-- Add wxNOEXCEPT (Marian VooDooMan Meravy).
 - Added Nepali translation (Him Prasad Gautam).
 
 All (GUI):

diff --git a/include/wx/cocoa/textctrl.h b/include/wx/cocoa/textctrl.h
index 50ff930220a90f227ca5d4eda58ddab42fb1b7e5..64e4f32a6c45b953f064fc48c21a26d880161e4f 100644 (file)
--- a/include/wx/cocoa/textctrl.h
+++ b/include/wx/cocoa/textctrl.h
@@ -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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index a3a08d026fc690f88610e1c7c976a3f2d8e578fd..a96a6e91f442a5dae5ddded636ed76286a59a90d 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -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 */
 /*  --------------------------------------------------------------------------- */

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index f0ba8549b239b640fa0be480742715e4cb0464d4..60e07203a7dbba84c55c2232433ec1f8e053c618 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -30,7 +30,7 @@ public:
                const wxValidator& validator = wxDefaultValidator,
                const wxString &name = wxTextCtrlNameStr);
 
-    virtual ~wxTextCtrl() wxNOEXCEPT;
+    virtual ~wxTextCtrl();
 
     bool Create(wxWindow *parent,
                 wxWindowID id,

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index bcff37f3ffdec39c9d70a82fa605b47f2cda7456..c594bc46b2fda31d8c84dd9bb3c426a33f7407bf 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -28,7 +28,7 @@ public:
                const wxValidator& validator = wxDefaultValidator,
                const wxString &name = wxTextCtrlNameStr);
 
-    virtual ~wxTextCtrl() wxNOEXCEPT;
+    virtual ~wxTextCtrl();
 
     bool Create(wxWindow *parent,
                 wxWindowID id,

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index f80eef03b215559ed18de1421dcbf9991934dde8..c56bcae45aad84d51edb206d6de3da67e0746896 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -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,

diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h
index 6790171991034dcddbdd5408c14e8a678b77e953..59a7570ad443318167b374e3ab96503926698796 100644 (file)
--- a/include/wx/os2/textctrl.h
+++ b/include/wx/os2/textctrl.h
@@ -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

diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h
index 94d714f8dcdf39ea9509ff5757d95000baac5319..c983eee96457b37d3ee4e0623ff4a31488c9efb0 100644 (file)
--- a/include/wx/osx/textctrl.h
+++ b/include/wx/osx/textctrl.h
@@ -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,

diff --git a/include/wx/stdstream.h b/include/wx/stdstream.h
index cc65cc34f134395e593c01129d0088505e13c7ac..27d48d5c8b02a4f1069ab17f48be4d1d4a2e80da 100644 (file)
--- a/include/wx/stdstream.h
+++ b/include/wx/stdstream.h
@@ -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;

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index dcf0311b74f945f2bd2be0f8ec9a3158f3d9ea94..d4780cc98747f84d0107b21fba41e3a6167749fb 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -679,7 +679,7 @@ public:
     // --------
 
     wxTextCtrlBase() { }
-    virtual ~wxTextCtrlBase() wxNOEXCEPT { }
+    virtual ~wxTextCtrlBase() { }
 
 
     // more readable flag testing methods

diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index bf3483b6f192fed8406565cba262eed6f33bac7f..6646ad91c7f85fa95c235bd248ae39a9808af47f 100644 (file)
--- a/include/wx/univ/textctrl.h
+++ b/include/wx/univ/textctrl.h
@@ -99,7 +99,7 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxTextCtrlNameStr);
 
-    virtual ~wxTextCtrl() wxNOEXCEPT;
+    virtual ~wxTextCtrl();
 
     // implement base class pure virtuals
     // ----------------------------------

diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h
index d2b10f90913986cd319156ec0fd05ac4263efb69..81a7e70662291b51c901cb28b424f0eae20ebe8e 100644 (file)
--- a/include/wx/x11/textctrl.h
+++ b/include/wx/x11/textctrl.h
@@ -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,

diff --git a/interface/wx/defs.h b/interface/wx/defs.h
index 43b41fb971359d61232f702e9bd6954258341d39..0c310f10d2929f1196def7cc921c5fecb86b23db 100644 (file)
--- a/interface/wx/defs.h
+++ b/interface/wx/defs.h
@@ -1725,22 +1725,6 @@ template <typename T> wxSwap(T& first, T& second);
 */
 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
-
 //@}
 
 

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index d8d2915f10b2204c2fbe7c5926fc3a82b9d9f190..ac476a5addc1005245937e3a8e7ff86daed3fd6b 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -940,7 +940,7 @@ class wxComboCtrlTextCtrl : public wxTextCtrl
 {
 public:
     wxComboCtrlTextCtrl() : wxTextCtrl() { }
-    virtual ~wxComboCtrlTextCtrl() wxNOEXCEPT { }
+    virtual ~wxComboCtrlTextCtrl() { }
 
     virtual wxWindow *GetMainWindowOfCompositeControl()
     {

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index f602d8ded544f364d369a54090caf731e4db01a4..64d00b43ffa7e05542077dae0d069d2998d18ef5 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -77,7 +77,7 @@ public:
         SetSizeHints(wxDefaultCoord, wxDefaultCoord);
     }
 
-    virtual ~wxSpinCtrlTextGeneric() wxNOEXCEPT
+    virtual ~wxSpinCtrlTextGeneric()
     {
         // MSW sends extra kill focus event on destroy
         if (m_spin)

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 3aa40f9fca8d206dffe779239c4e751fcabcf415..28ac6d781ac979aebec946371765c635cb544f76 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -95,8 +95,6 @@ class WXDLLEXPORT wxTreeTextCtrl: public wxTextCtrl
 public:
     wxTreeTextCtrl(wxGenericTreeCtrl *owner, wxGenericTreeItem *item);
 
-    virtual ~wxTreeTextCtrl() wxNOEXCEPT {}
-
     void EndEdit( bool discardChanges );
 
     const wxGenericTreeItem* item() const { return m_itemEdited; }

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 0e408c532b6a6a981af020ccba1abdce7247a338..ecb98e6bdc1a448048206482c9e550db0a4b2749 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -610,7 +610,7 @@ void wxTextCtrl::Init()
     m_anonymousMarkList = NULL;
 }
 
-wxTextCtrl::~wxTextCtrl() wxNOEXCEPT
+wxTextCtrl::~wxTextCtrl()
 {
     if (m_text)
         GTKDisconnect(m_text);

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 2254d29edeb4971b32fd50e275a1096aba850220..7ce0d35e3d62abfd17c9d6ef6fc0b2c2e9350628 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -226,7 +226,7 @@ void wxTextCtrl::Init()
     m_vScrollbar = NULL;
 }
 
-wxTextCtrl::~wxTextCtrl() wxNOEXCEPT
+wxTextCtrl::~wxTextCtrl()
 {
 }
 

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 9fa201a9315b8331ad7ad6cd6df796dc9bb1410a..4245b581258ad8b6941504df73b4fcb3061bdec1 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -229,7 +229,7 @@ void wxTextCtrl::Init()
     m_isNativeCaretShown = true;
 }
 
-wxTextCtrl::~wxTextCtrl() wxNOEXCEPT
+wxTextCtrl::~wxTextCtrl()
 {
 #if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
     if ( m_dropTarget == wxRICHTEXT_DEFAULT_DROPTARGET )

diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index 8c3875cc82ca903baead1fb17845d4b5e4cc6e0f..041ea21d516a17f5a62c58d68ecb09bbdcfaa429 100644 (file)
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -764,7 +764,7 @@ bool wxTextCtrl::Create(wxWindow *parent,
     return true;
 }
 
-wxTextCtrl::~wxTextCtrl() wxNOEXCEPT
+wxTextCtrl::~wxTextCtrl()
 {
     delete m_cmdProcessor;