moving rounded rect and ellipse to path class

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 75426eca324364bc0bed4bc3bb59c37c169c399c..499f2bad0f04219af330c552eee5ac0314f60abd 100644 (file)
--- 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);
 
 WXDLLEXPORT wxString
 wxStripMenuCodes(const wxString& str, int flags = wxStrip_All);
 

-// obsolete and deprecated version, do not use

 #if WXWIN_COMPATIBILITY_2_6
 #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)
 );
 wxDEPRECATED(
     WXDLLEXPORT wxChar* wxStripMenuCodes(const wxChar *in, wxChar *out = NULL)
 );

-#endif

 
 #if wxUSE_ACCEL
 class WXDLLEXPORT wxAcceleratorEntry;
 
 #if wxUSE_ACCEL
 class WXDLLEXPORT wxAcceleratorEntry;

+
+// use wxAcceleratorEntry::Create() or FromString() methods instead

 wxDEPRECATED(
     WXDLLEXPORT wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
 );
 #endif // wxUSE_ACCEL
 
 wxDEPRECATED(
     WXDLLEXPORT wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
 );
 #endif // wxUSE_ACCEL
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

 // ----------------------------------------------------------------------------
 // Window search
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Window search
 // ----------------------------------------------------------------------------