Compilation fix for WXWIN_COMPATIBILITY_2_4==1.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/deprecated/prop.cpp b/contrib/src/deprecated/prop.cpp
index b1af196e3612cd67b83e7193db6d85f3b59a6725..ae168ad1ae1dfa79e2421a05f430997a1a915d83 100644 (file)
--- a/contrib/src/deprecated/prop.cpp
+++ b/contrib/src/deprecated/prop.cpp
@@ -35,8 +35,10 @@
 #include <math.h>
 #include <string.h>
 
 #include <math.h>
 #include <string.h>
 

+#if !WXWIN_COMPATIBILITY_2_4

 static inline wxChar* copystring(const wxChar* s)
     { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
 static inline wxChar* copystring(const wxChar* s)
     { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }

+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxPropertyValue, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxPropertyValue, wxObject)
 

diff --git a/contrib/src/deprecated/proplist.cpp b/contrib/src/deprecated/proplist.cpp
index 14da01698651b9b94d91b3e3639491bcea1b64a6..29625022343c644c90ee49e8342a404ce1993ff5 100644 (file)
--- a/contrib/src/deprecated/proplist.cpp
+++ b/contrib/src/deprecated/proplist.cpp
@@ -57,8 +57,10 @@
 #include <math.h>
 #include <string.h>
 
 #include <math.h>
 #include <string.h>
 

+#if !WXWIN_COMPATIBILITY_2_4

 static inline wxChar* copystring(const wxChar* s)
     { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
 static inline wxChar* copystring(const wxChar* s)
     { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }

+#endif

 
 // ----------------------------------------------------------------------------
 // Property text edit control
 
 // ----------------------------------------------------------------------------
 // Property text edit control

diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
index d6ff9e7fe209d6febaf6fb041d57ba12a70d647e..4c148bb0087f77d65d05cbcdbbd5b54ea1768e52 100644 (file)
--- a/contrib/src/deprecated/resource.cpp
+++ b/contrib/src/deprecated/resource.cpp
@@ -89,8 +89,10 @@
 #include "wx/deprecated/resource.h"
 #include "wx/deprecated/wxexpr.h"
 
 #include "wx/deprecated/resource.h"
 #include "wx/deprecated/wxexpr.h"
 

+#if !WXWIN_COMPATIBILITY_2_4

 static inline wxChar* copystring(const wxChar* s)
     { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
 static inline wxChar* copystring(const wxChar* s)
     { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }

+#endif

 
 // Forward (private) declarations
 bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db);
 
 // Forward (private) declarations
 bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db);

diff --git a/contrib/src/deprecated/wxexpr.cpp b/contrib/src/deprecated/wxexpr.cpp
index c859d8bccf66f53129cbc009e4bb7917bb208935..f8450343cbd10c78a9217f3b59ecb2442e9c76d4 100644 (file)
--- a/contrib/src/deprecated/wxexpr.cpp
+++ b/contrib/src/deprecated/wxexpr.cpp
@@ -32,8 +32,10 @@
 #include "wx/deprecated/expr.h"
 #include "wx/deprecated/wxexpr.h"
 
 #include "wx/deprecated/expr.h"
 #include "wx/deprecated/wxexpr.h"
 

+#if !WXWIN_COMPATIBILITY_2_4

 static inline wxChar* copystring(const wxChar* s)
     { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
 static inline wxChar* copystring(const wxChar* s)
     { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }

+#endif

 
 extern "C" void add_expr(char *);
 extern "C" void LexFromFile(FILE *fd);
 
 extern "C" void add_expr(char *);
 extern "C" void LexFromFile(FILE *fd);