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

Avoid warnings with MSVC 5.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2005-06-21 20:16:03 +00:00
parent a3c1ce50b0
commit 688bdfe9d1
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/event.h
View File

@@ -514,7 +514,9 @@ private:
#ifdef __VISUALC__ #ifdef __VISUALC__
// 'this' : used in base member initializer list (for m_commandString) // 'this' : used in base member initializer list (for m_commandString)
#pragma warning(push) #if _MSC_VER > 1100
#pragma warning(push)
#endif
#pragma warning(disable:4355) #pragma warning(disable:4355)
#endif #endif
@@ -580,7 +582,7 @@ private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCommandEvent) DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCommandEvent)
}; };
#ifdef __VISUALC__ #if defined(__VISUALC__) && (_MSC_VER > 1100)
#pragma warning(pop) #pragma warning(pop)
#endif #endif

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

@@ -32,7 +32,9 @@ extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
// avoid triggering this stupid VC++ warning // avoid triggering this stupid VC++ warning
#ifdef __VISUALC__ #ifdef __VISUALC__
#pragma warning(push) #if _MSC_VER > 1100
#pragma warning(push)
#endif
#pragma warning(disable:4355) // 'this' used in base member initializer list #pragma warning(disable:4355) // 'this' used in base member initializer list
#endif #endif
@@ -96,7 +98,7 @@ private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#ifdef __VISUALC__ #if defined(__VISUALC__) && (_MSC_VER > 1100)
#pragma warning(pop) #pragma warning(pop)
#endif #endif