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

disable VC++ warning 4355 in wx/defs.h once and for all instead of doing it in 4 different places

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-10-09 22:34:08 +00:00
parent 547703373c
commit 77df51f4fb
4 changed files with 4 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/wx/generic/scrolwin.h
View File

@@ -26,14 +26,6 @@ extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
#define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
#endif
// avoid triggering this stupid VC++ warning
#ifdef __VISUALC__
#if _MSC_VER > 1100
#pragma warning(push)
#endif
#pragma warning(disable:4355) // 'this' used in base member initializer list
#endif
// ----------------------------------------------------------------------------
// wxGenericScrolledWindow
// ----------------------------------------------------------------------------
@@ -94,10 +86,5 @@ private:
DECLARE_EVENT_TABLE()
};
#if defined(__VISUALC__) && (_MSC_VER > 1100)
#pragma warning(pop)
#endif
#endif
// _WX_GENERIC_SCROLLWIN_H_
#endif // _WX_GENERIC_SCROLLWIN_H_