IMPLEMENT_DYNAMIC_CLASS(wxQueryLayoutInfoEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxCalculateLayoutEvent, wxEvent)
-const int wxEVT_QUERY_LAYOUT_INFO = wxNewEventType();
-const int wxEVT_CALCULATE_LAYOUT = wxNewEventType();
+DEFINE_EVENT_TYPE(wxEVT_QUERY_LAYOUT_INFO)
+DEFINE_EVENT_TYPE(wxEVT_CALCULATE_LAYOUT)
#if wxUSE_SASH
IMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow)