(harmless) VC++ warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
4d373d20d6
commit
21eefb768a
@ -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)
|
||||
{
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user