X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/808260ec3235941ec45f50baca8dbf3655498f24..1deef99727c57b21976be81a14312f001fededb4:/include/wx/menuitem.h diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h index 55a6a3172f..1da5f65211 100644 --- a/include/wx/menuitem.h +++ b/include/wx/menuitem.h @@ -35,7 +35,7 @@ class WXDLLIMPEXP_FWD_CORE wxMenu; // menu or a separator // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuItemBase : public wxObject +class WXDLLIMPEXP_CORE wxMenuItemBase : public wxObject { public: // creation @@ -56,7 +56,6 @@ public: // get/set id void SetId(int itemid) { m_id = itemid; } int GetId() const { return m_id; } - bool IsSeparator() const { return m_id == wxID_SEPARATOR; } // the item's text (or name) // @@ -81,6 +80,7 @@ public: // what kind of menu item we are wxItemKind GetKind() const { return m_kind; } void SetKind(wxItemKind kind) { m_kind = kind; } + bool IsSeparator() const { return m_kind == wxITEM_SEPARATOR; } virtual void SetCheckable(bool checkable) { m_kind = checkable ? wxITEM_CHECK : wxITEM_NORMAL; } bool IsCheckable() const @@ -145,7 +145,7 @@ public: } protected: - int m_id; // numeric id of the item >= 0 or wxID_ANY or wxID_SEPARATOR + wxWindowIDRef m_id; // numeric id of the item >= 0 or wxID_ANY or wxID_SEPARATOR wxMenu *m_parentMenu, // the menu we belong to *m_subMenu; // our sub menu or NULL wxString m_text, // label of the item