From 24f54e45dcab823c7bf4af90fd912786855627c4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 19 Nov 2012 11:53:49 +0000 Subject: [PATCH] Add wxNOEXCEPT to all wxTextCtrl dtors. Fix compilation with some compilers after r72978 which added wxNOEXCEPT to wxTextCtrlBase dtor and wxTextCtrl dtor in wxMSW but not in all the other ports. See #14826. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cocoa/textctrl.h | 2 +- include/wx/gtk/textctrl.h | 2 +- include/wx/gtk1/textctrl.h | 2 +- include/wx/os2/textctrl.h | 2 +- include/wx/osx/textctrl.h | 2 +- include/wx/univ/textctrl.h | 2 +- include/wx/x11/textctrl.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/wx/cocoa/textctrl.h b/include/wx/cocoa/textctrl.h index 64e4f32a6c..50ff930220 100644 --- 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(); + virtual ~wxTextCtrl() wxNOEXCEPT; // ------------------------------------------------------------------------ // Cocoa specifics diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h index 60e07203a7..f0ba8549b2 100644 --- 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(); + virtual ~wxTextCtrl() wxNOEXCEPT; bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h index c594bc46b2..bcff37f3ff 100644 --- 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(); + virtual ~wxTextCtrl() wxNOEXCEPT; bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h index 59a7570ad4..6790171991 100644 --- 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(); + virtual ~wxTextCtrl() wxNOEXCEPT; bool Create( wxWindow* pParent ,wxWindowID vId diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h index c983eee964..94d714f8dc 100644 --- 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(); + virtual ~wxTextCtrl() wxNOEXCEPT; bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h index 6646ad91c7..bf3483b6f1 100644 --- 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(); + virtual ~wxTextCtrl() wxNOEXCEPT; // implement base class pure virtuals // ---------------------------------- diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h index 81a7e70662..d2b10f9091 100644 --- 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(); + virtual ~wxTextCtrl() wxNOEXCEPT; bool Create(wxWindow *parent, wxWindowID id,