X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d65c269b3f665e15a8ae1b8fff063b2ec0ef19a7..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/menuitem.h?ds=sidebyside diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h index dac0c55cf5..48e98922be 100644 --- a/include/wx/menuitem.h +++ b/include/wx/menuitem.h @@ -6,7 +6,7 @@ // Created: 25.10.99 // RCS-ID: $Id$ // Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_MENUITEM_H_BASE_ @@ -38,10 +38,10 @@ class WXDLLEXPORT wxMenuItemBase : public wxObject public: // creation static wxMenuItem *New(wxMenu *parentMenu = (wxMenu *)NULL, - int id = wxID_SEPARATOR, + int itemid = wxID_SEPARATOR, const wxString& text = wxEmptyString, const wxString& help = wxEmptyString, - wxItemKind kind = wxItem_Normal, + wxItemKind kind = wxITEM_NORMAL, wxMenu *subMenu = (wxMenu *)NULL); // destruction: wxMenuItem will delete its submenu @@ -51,7 +51,7 @@ public: wxMenu *GetMenu() const { return m_parentMenu; } // get/set id - void SetId(int id) { m_id = id; } + void SetId(int itemid) { m_id = itemid; } int GetId() const { return m_id; } bool IsSeparator() const { return m_id == wxID_SEPARATOR; } @@ -71,8 +71,9 @@ public: // what kind of menu item we are wxItemKind GetKind() const { return m_kind; } - virtual void SetCheckable(bool checkable) { m_kind = wxItem_Check; } - bool IsCheckable() const { return m_kind == wxItem_Check; } + virtual void SetCheckable(bool checkable) { m_kind = checkable ? wxITEM_CHECK : wxITEM_NORMAL; } + bool IsCheckable() const + { return m_kind == wxITEM_CHECK || m_kind == wxITEM_RADIO; } bool IsSubMenu() const { return m_subMenu != NULL; } void SetSubMenu(wxMenu *menu) { m_subMenu = menu; } @@ -108,14 +109,14 @@ public: const wxString& GetName() const { return GetText(); } static wxMenuItem *New(wxMenu *parentMenu, - int id, + int itemid, const wxString& text, const wxString& help, bool isCheckable, wxMenu *subMenu = (wxMenu *)NULL) { - return New(parentMenu, id, text, help, - isCheckable ? wxItem_Check : wxItem_Normal, subMenu); + return New(parentMenu, itemid, text, help, + isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu); } protected: @@ -130,10 +131,10 @@ protected: // this ctor is for the derived classes only, we're never created directly wxMenuItemBase(wxMenu *parentMenu = (wxMenu *)NULL, - int id = wxID_SEPARATOR, + int itemid = wxID_SEPARATOR, const wxString& text = wxEmptyString, const wxString& help = wxEmptyString, - wxItemKind kind = wxItem_Normal, + wxItemKind kind = wxITEM_NORMAL, wxMenu *subMenu = (wxMenu *)NULL); private: @@ -160,10 +161,10 @@ private: #include "wx/gtk/menuitem.h" #elif defined(__WXMAC__) #include "wx/mac/menuitem.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/menuitem.h" #elif defined(__WXPM__) #include "wx/os2/menuitem.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/menuitem.h" #endif #endif // wxUSE_BASE_CLASSES_ONLY/!wxUSE_BASE_CLASSES_ONLY