renamed wxWindow::Clear() to ClearBackground() (fixes bug 783576)

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 0880439f8530df57d501dca855a4b581e37eceaf..c25c3efe535c5d9eb6f8621ca14abca16cf630ce 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "utils.h"
 #endif
 
     #pragma interface "utils.h"
 #endif
 


@@ -24,6 +24,8 @@
 #include "wx/list.h"
 #include "wx/filefn.h"
 
 #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"
 // need this for wxGetDiskSpace() as we can't, unfortunately, forward declare
 // wxLongLong
 #include "wx/longlong.h"


@@ -57,7 +59,9 @@ class WXDLLIMPEXP_BASE wxPoint;
 // ----------------------------------------------------------------------------
 
 // Make a copy of this string using 'new'
 // ----------------------------------------------------------------------------
 
 // Make a copy of this string using 'new'

+#if WXWIN_COMPATIBILITY_2_4

 WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s);
 WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s);

+#endif

 
 #if WXWIN_COMPATIBILITY_2
 // Matches string one within string two regardless of case
 
 #if WXWIN_COMPATIBILITY_2
 // Matches string one within string two regardless of case