From: Vadim Zeitlin Date: Mon, 19 Nov 2012 18:01:01 +0000 (+0000) Subject: More compilation fixes after wxNOEXCEPT introduction. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ab7f0034828cfc121014b3e1e29bba583fb6d832 More compilation fixes after wxNOEXCEPT introduction. This is a temporary change, r72984 and the following changes (see #14826) will probably be reverted soon anyhow, but for now at least fix wxGTK compilation. Closes #14837. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index 28ac6d781a..3aa40f9fca 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -95,6 +95,8 @@ 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 ecb98e6bdc..0e408c532b 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -610,7 +610,7 @@ void wxTextCtrl::Init() m_anonymousMarkList = NULL; } -wxTextCtrl::~wxTextCtrl() +wxTextCtrl::~wxTextCtrl() wxNOEXCEPT { if (m_text) GTKDisconnect(m_text); diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index 7ce0d35e3d..2254d29ede 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -226,7 +226,7 @@ void wxTextCtrl::Init() m_vScrollbar = NULL; } -wxTextCtrl::~wxTextCtrl() +wxTextCtrl::~wxTextCtrl() wxNOEXCEPT { } diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp index 041ea21d51..8c3875cc82 100644 --- a/src/univ/textctrl.cpp +++ b/src/univ/textctrl.cpp @@ -764,7 +764,7 @@ bool wxTextCtrl::Create(wxWindow *parent, return true; } -wxTextCtrl::~wxTextCtrl() +wxTextCtrl::~wxTextCtrl() wxNOEXCEPT { delete m_cmdProcessor;