GetClientData(int n) should be const (part of patch 649438)

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 0880439f8530df57d501dca855a4b581e37eceaf..988754c1b68370a0c45efa98e7da91c595d03938 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -23,6 +23,7 @@
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/filefn.h"
+#include "wx/arrstr.h"
 
 // need this for wxGetDiskSpace() as we can't, unfortunately, forward declare
 // wxLongLong
@@ -57,7 +58,9 @@ class WXDLLIMPEXP_BASE wxPoint;
 // ----------------------------------------------------------------------------
 
 // Make a copy of this string using 'new'
+#if WXWIN_COMPATIBILITY_2_4
 WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s);
+#endif
 
 #if WXWIN_COMPATIBILITY_2
 // Matches string one within string two regardless of case