X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..7344108e8a129a3f9b4df5ab0f98a1713db03b89:/include/wx/univ/menuitem.h?ds=sidebyside diff --git a/include/wx/univ/menuitem.h b/include/wx/univ/menuitem.h index d515ce6d7d..90da59a9fe 100644 --- a/include/wx/univ/menuitem.h +++ b/include/wx/univ/menuitem.h @@ -20,12 +20,12 @@ class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase { public: // ctor & dtor - wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL, + wxMenuItem(wxMenu *parentMenu = NULL, int id = wxID_SEPARATOR, const wxString& name = wxEmptyString, const wxString& help = wxEmptyString, wxItemKind kind = wxITEM_NORMAL, - wxMenu *subMenu = (wxMenu *)NULL); + wxMenu *subMenu = NULL); virtual ~wxMenuItem(); // override base class virtuals to update the item appearance on screen @@ -72,14 +72,14 @@ public: wxCoord GetPosition() const { - wxASSERT_MSG( m_posY != wxDefaultCoord, _T("must call SetHeight first!") ); + wxASSERT_MSG( m_posY != wxDefaultCoord, wxT("must call SetHeight first!") ); return m_posY; } wxCoord GetHeight() const { - wxASSERT_MSG( m_height != wxDefaultCoord, _T("must call SetHeight first!") ); + wxASSERT_MSG( m_height != wxDefaultCoord, wxT("must call SetHeight first!") ); return m_height; }