X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee0a94cfc2f71e8b770eedda5197a1f4bd62b5cb..59720690dfa73732d165642d6e9cb8330a92549b:/include/wx/utils.h diff --git a/include/wx/utils.h b/include/wx/utils.h index 75426eca32..499f2bad0f 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -558,20 +558,23 @@ enum WXDLLEXPORT wxString wxStripMenuCodes(const wxString& str, int flags = wxStrip_All); -// obsolete and deprecated version, do not use #if WXWIN_COMPATIBILITY_2_6 +// obsolete and deprecated version, do not use, use the above overload instead wxDEPRECATED( WXDLLEXPORT wxChar* wxStripMenuCodes(const wxChar *in, wxChar *out = NULL) ); -#endif #if wxUSE_ACCEL class WXDLLEXPORT wxAcceleratorEntry; + +// use wxAcceleratorEntry::Create() or FromString() methods instead wxDEPRECATED( WXDLLEXPORT wxAcceleratorEntry *wxGetAccelFromString(const wxString& label) ); #endif // wxUSE_ACCEL +#endif // WXWIN_COMPATIBILITY_2_6 + // ---------------------------------------------------------------------------- // Window search // ----------------------------------------------------------------------------