X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8bb6b2c057edbcc5b87f00a8af6ac70f6fd69727..e2bc1d69812f8fc3f6ae24508a9d007ad5d00ede:/include/wx/utils.h

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 549899ae7c..499f2bad0f 100644
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -558,18 +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;
-WXDLLEXPORT wxAcceleratorEntry *wxGetAccelFromString(const wxString& label);
+
+// use wxAcceleratorEntry::Create() or FromString() methods instead
+wxDEPRECATED(
+    WXDLLEXPORT wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
+);
 #endif // wxUSE_ACCEL
 
+#endif // WXWIN_COMPATIBILITY_2_6
+
 // ----------------------------------------------------------------------------
 // Window search
 // ----------------------------------------------------------------------------