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 28ac6d781ac979aebec946371765c635cb544f76..3aa40f9fca8d206dffe779239c4e751fcabcf415 100644 (file)
--- 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);
 
 public:
     wxTreeTextCtrl(wxGenericTreeCtrl *owner, wxGenericTreeItem *item);
 

+    virtual ~wxTreeTextCtrl() wxNOEXCEPT {}
+

     void EndEdit( bool discardChanges );
 
     const wxGenericTreeItem* item() const { return m_itemEdited; }
     void EndEdit( bool discardChanges );
 
     const wxGenericTreeItem* item() const { return m_itemEdited; }

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

-wxTextCtrl::~wxTextCtrl()
+wxTextCtrl::~wxTextCtrl() wxNOEXCEPT

 {
     if (m_text)
         GTKDisconnect(m_text);
 {
     if (m_text)
         GTKDisconnect(m_text);

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

-wxTextCtrl::~wxTextCtrl()
+wxTextCtrl::~wxTextCtrl() wxNOEXCEPT

 {
 }
 
 {
 }
 

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

-wxTextCtrl::~wxTextCtrl()
+wxTextCtrl::~wxTextCtrl() wxNOEXCEPT

 {
     delete m_cmdProcessor;
 
 {
     delete m_cmdProcessor;