disable VC++ warning 4355 in wx/defs.h once and for all instead of doing it in 4 different places
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -504,14 +504,6 @@ private:
|
||||
};
|
||||
#endif
|
||||
|
||||
#ifdef __VISUALC__
|
||||
// 'this' : used in base member initializer list (for m_commandString)
|
||||
#if _MSC_VER > 1100
|
||||
#pragma warning(push)
|
||||
#endif
|
||||
#pragma warning(disable:4355)
|
||||
#endif
|
||||
|
||||
class WXDLLIMPEXP_CORE wxCommandEvent : public wxEvent
|
||||
{
|
||||
public:
|
||||
@@ -574,10 +566,6 @@ private:
|
||||
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCommandEvent)
|
||||
};
|
||||
|
||||
#if defined(__VISUALC__) && (_MSC_VER > 1100)
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_4
|
||||
inline void wxCommandEventStringHelper::operator=(const wxString &str)
|
||||
{
|
||||
|
Reference in New Issue
Block a user