X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/56454c1513ec10aa70cef0a492d1ed6fab016451..aaedb44c5e7169db22d32e8a335936e3213da33a:/include/wx/menu.h diff --git a/include/wx/menu.h b/include/wx/menu.h index 963a8fac0b..876a72e162 100644 --- a/include/wx/menu.h +++ b/include/wx/menu.h @@ -267,7 +267,7 @@ public: // Updates the UI for a menu and all submenus recursively. source is the // object that has the update event handlers defined for it. If NULL, the // menu or associated window will be used. - void UpdateUI(wxEvtHandler* source = (wxEvtHandler*)NULL); + void UpdateUI(wxEvtHandler* source = NULL); // get the menu bar this menu is attached to (may be NULL, always NULL for // popup menus). Traverse up the menu hierarchy to find it. @@ -377,7 +377,7 @@ protected: static bool ms_locked; - DECLARE_NO_COPY_CLASS(wxMenuBase) + wxDECLARE_NO_COPY_CLASS(wxMenuBase); }; // ---------------------------------------------------------------------------- @@ -498,7 +498,9 @@ public: #if WXWIN_COMPATIBILITY_2_8 // get or change the label of the menu at given position + // Deprecated in favour of SetMenuLabel wxDEPRECATED( void SetLabelTop(size_t pos, const wxString& label) ); + // Deprecated in favour of GetMenuLabelText wxDEPRECATED( wxString GetLabelTop(size_t pos) const ); #endif @@ -509,7 +511,7 @@ protected: // the frame we are attached to (may be NULL) wxFrame *m_menuBarFrame; - DECLARE_NO_COPY_CLASS(wxMenuBarBase) + wxDECLARE_NO_COPY_CLASS(wxMenuBarBase); }; // ----------------------------------------------------------------------------