X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52af3158e974b042008474268570f3bdb7ce95ee..154014d68152d7dcca9ee08c593a3d89fc8fe488:/include/wx/menu.h diff --git a/include/wx/menu.h b/include/wx/menu.h index 0de4fb3eef..8cae2e1255 100644 --- a/include/wx/menu.h +++ b/include/wx/menu.h @@ -40,7 +40,7 @@ WX_DECLARE_EXPORTED_LIST(wxMenuItem, wxMenuItemList); // wxMenu // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuBase : public wxEvtHandler +class WXDLLIMPEXP_CORE wxMenuBase : public wxEvtHandler { public: // create a menu @@ -68,7 +68,7 @@ public: } // append a separator to the menu - wxMenuItem* AppendSeparator() { return Append(wxID_SEPARATOR, wxEmptyString); } + wxMenuItem* AppendSeparator() { return Append(wxID_SEPARATOR); } // append a check item wxMenuItem* AppendCheckItem(int itemid, @@ -384,7 +384,7 @@ protected: // wxMenuBar // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxMenuBarBase : public wxWindow +class WXDLLIMPEXP_CORE wxMenuBarBase : public wxWindow { public: // default ctor @@ -512,19 +512,6 @@ protected: DECLARE_NO_COPY_CLASS(wxMenuBarBase) }; -#if WXWIN_COMPATIBILITY_2_8 -// get or change the label of the menu at given position -void wxMenuBarBase::SetLabelTop(size_t pos, const wxString& label) -{ - SetMenuLabel(pos, label); -} - -wxString wxMenuBarBase::GetLabelTop(size_t pos) const -{ - return GetMenuLabel(pos); -} -#endif - // ---------------------------------------------------------------------------- // include the real class declaration // ----------------------------------------------------------------------------