X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e3be693d0e18531299c8f45d27d79f23f948eba..1b5ff3a3feed9f5a23dcf8de40189c0af2746483:/include/wx/utils.h

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 0880439f85..abbbad94f2 100644
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "utils.h"
 #endif
 
@@ -24,6 +24,8 @@
 #include "wx/list.h"
 #include "wx/filefn.h"
 
+class WXDLLIMPEXP_BASE wxArrayString;
+
 // need this for wxGetDiskSpace() as we can't, unfortunately, forward declare
 // wxLongLong
 #include "wx/longlong.h"
@@ -57,11 +59,8 @@ class WXDLLIMPEXP_BASE wxPoint;
 // ----------------------------------------------------------------------------
 
 // Make a copy of this string using 'new'
+#if WXWIN_COMPATIBILITY_2_4
 WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s);
-
-#if WXWIN_COMPATIBILITY_2
-// Matches string one within string two regardless of case
-WXDLLIMPEXP_BASE bool StringMatch(const wxChar *one, const wxChar *two, bool subString = TRUE, bool exact = FALSE);
 #endif
 
 // A shorter way of using strcmp
@@ -102,15 +101,9 @@ WXDLLEXPORT bool wxSetDetectableAutoRepeat( bool flag );
 
 // Generate a unique ID
 WXDLLEXPORT long wxNewId();
-#if !defined(NewId) && defined(WXWIN_COMPATIBILITY)
-    #define NewId wxNewId
-#endif
 
 // Ensure subsequent IDs don't clash with this one
 WXDLLEXPORT void wxRegisterId(long id);
-#if !defined(RegisterId) && defined(WXWIN_COMPATIBILITY)
-    #define RegisterId wxRegisterId
-#endif
 
 // Return the current ID
 WXDLLEXPORT long wxGetCurrentId();