wxITEM_FOO instead of wxItem_Foo, for the sake of consistency
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -41,7 +41,7 @@ public:
|
||||
int id = 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
|
||||
@@ -71,9 +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; }
|
||||
virtual void SetCheckable(bool checkable) { m_kind = wxITEM_CHECK; }
|
||||
bool IsCheckable() const
|
||||
{ return m_kind == wxItem_Check || m_kind == wxItem_Radio; }
|
||||
{ return m_kind == wxITEM_CHECK || m_kind == wxITEM_RADIO; }
|
||||
|
||||
bool IsSubMenu() const { return m_subMenu != NULL; }
|
||||
void SetSubMenu(wxMenu *menu) { m_subMenu = menu; }
|
||||
@@ -116,7 +116,7 @@ public:
|
||||
wxMenu *subMenu = (wxMenu *)NULL)
|
||||
{
|
||||
return New(parentMenu, id, text, help,
|
||||
isCheckable ? wxItem_Check : wxItem_Normal, subMenu);
|
||||
isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu);
|
||||
}
|
||||
|
||||
protected:
|
||||
@@ -134,7 +134,7 @@ protected:
|
||||
int id = wxID_SEPARATOR,
|
||||
const wxString& text = wxEmptyString,
|
||||
const wxString& help = wxEmptyString,
|
||||
wxItemKind kind = wxItem_Normal,
|
||||
wxItemKind kind = wxITEM_NORMAL,
|
||||
wxMenu *subMenu = (wxMenu *)NULL);
|
||||
|
||||
private:
|
||||
|
Reference in New Issue
Block a user