X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92301a59158eaf3d53e6262aa9888cff0babf322..0912690b65b3c58c0e12870fb971675ca5572ae6:/include/wx/event.h diff --git a/include/wx/event.h b/include/wx/event.h index d70beb59e6..81d0cecc08 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) { @@ -1118,6 +1126,7 @@ public: { m_eventType = wxEVT_MOVING; m_id = id; } wxPoint GetPosition() const { return m_pos; } + void SetPosition(const wxPoint& pos) { m_pos = pos; } wxRect GetRect() const { return m_rect; } void SetRect(wxRect rect) { m_rect = rect; } @@ -1514,7 +1523,7 @@ public: int joystick = wxJOYSTICK1, int change = 0) : wxEvent(0, type), - m_pos(0, 0), + m_pos(), m_zPosition(0), m_buttonChange(change), m_buttonState(state),