added wxThreadHelper class (patch 756906)

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index f393cbffb5443176f32700b16a4bc5b1d2f3efff..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
@@ -56,14 +57,10 @@ class WXDLLIMPEXP_BASE wxPoint;
 // String functions (deprecated, use wxString)
 // ----------------------------------------------------------------------------
 
-// Useful buffer (FIXME VZ: To be removed!!!)
-// Now only needed in MSW port
-#if !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) && !defined(__WXMGL__) && !defined(__WXMAC__)
-WXDLLIMPEXP_DATA_BASE(extern wxChar*) wxBuffer;
-#endif
-
 // 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