Fix for menu items not being disabled after a modal dialog is shown

[wxWidgets.git] / include / wx / event.h

diff --git a/include/wx/event.h b/include/wx/event.h
index d70beb59e64c7c12e11f4a76158316e059e075e6..6399b743d2f198cb502bdc61a8b6b7ef9061edf9 100644 (file)
--- 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; }