From 21eefb768a6613cc2275cc0595e21d9b165802ee Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 19 Jan 2005 02:28:34 +0000 Subject: [PATCH] (harmless) VC++ warning fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/event.h | 8 ++++++++ src/common/event.cpp | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/include/wx/event.h b/include/wx/event.h index d70beb59e6..fc5cf8f04f 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -509,6 +509,10 @@ private: }; #endif +#ifdef __VISUALC__ + // 'this' : used in base member initializer list (for m_commandString) + #pragma warning(disable:4355) +#endif class WXDLLIMPEXP_CORE wxCommandEvent : public wxEvent { @@ -572,6 +576,10 @@ private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCommandEvent) }; +#ifdef __VISUALC__ + #pragma warning(default:4355) +#endif + #if WXWIN_COMPATIBILITY_2_4 inline void wxCommandEventStringHelper::operator=(const wxString &str) { diff --git a/src/common/event.cpp b/src/common/event.cpp index 5c65c985af..a2431a5b6c 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -381,6 +381,11 @@ wxEvent::wxEvent(const wxEvent &src) * */ +#ifdef __VISUALC__ + // 'this' : used in base member initializer list (for m_commandString) + #pragma warning(disable:4355) +#endif + wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId) : wxEvent(theId, commandType) #if WXWIN_COMPATIBILITY_2_4 @@ -397,6 +402,10 @@ wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId) m_propagationLevel = wxEVENT_PROPAGATE_MAX; } +#ifdef __VISUALC__ + #pragma warning(default:4355) +#endif + wxString wxCommandEvent::GetString() const { if(m_eventType != wxEVT_COMMAND_TEXT_UPDATED || !m_eventObject) -- 2.45.2