Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More compilation fixes after wxNOEXCEPT introduction.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2012-11-19 18:01:01 +00:00
parent f321d0bc0c
commit ab7f003482
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/generic/treectlg.cpp
View File

@@ -95,6 +95,8 @@ 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; }

2
src/gtk/textctrl.cpp
View File

@@ -610,7 +610,7 @@ void wxTextCtrl::Init()
m_anonymousMarkList = NULL; m_anonymousMarkList = NULL;
} }
wxTextCtrl::~wxTextCtrl() wxTextCtrl::~wxTextCtrl() wxNOEXCEPT
{ {
if (m_text) if (m_text)
GTKDisconnect(m_text); GTKDisconnect(m_text);

2
src/gtk1/textctrl.cpp
View File

@@ -226,7 +226,7 @@ void wxTextCtrl::Init()
m_vScrollbar = NULL; m_vScrollbar = NULL;
} }
wxTextCtrl::~wxTextCtrl() wxTextCtrl::~wxTextCtrl() wxNOEXCEPT
{ {
} }

2
src/univ/textctrl.cpp
View File

@@ -764,7 +764,7 @@ bool wxTextCtrl::Create(wxWindow *parent,
return true; return true;
} }
wxTextCtrl::~wxTextCtrl() wxTextCtrl::~wxTextCtrl() wxNOEXCEPT
{ {
delete m_cmdProcessor; delete m_cmdProcessor;