add comparison operators for wxPen/BrushStyle and wxSOLID/... constants to avoid...

[wxWidgets.git] / include / wx / menuitem.h

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 75b2dcff3d7a44c40b88f52f968d3ce817e1e859..f8cf44752a27b4944bd754bc6d6586319b84cc87 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -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
@@ -175,7 +175,7 @@ inline void wxMenuItemBase::SetName(const wxString &str)
 inline wxString wxMenuItemBase::GetName() const
     { return GetItemLabel(); }
 inline wxString wxMenuItemBase::GetLabel() const
-    { return GetLabelFromText(m_text); }
+    { return GetLabelText(m_text); }
 inline const wxString& wxMenuItemBase::GetText() const { return m_text; }
 inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text); }
 #endif // WXWIN_COMPATIBILITY_2_8