From: Mattia Barbon <mbarbon@cpan.org>
Date: Thu, 11 Sep 2003 16:41:14 +0000 (+0000)
Subject:   Compilation fix for WXWIN_COMPATIBILITY_2_4==1.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bba965d6d668b130e627aa93998529bbcbed14a4

  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 b1af196e36..ae168ad1ae 100644
--- a/contrib/src/deprecated/prop.cpp
+++ b/contrib/src/deprecated/prop.cpp
@@ -35,8 +35,10 @@
 #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); }
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxPropertyValue, wxObject)
 
diff --git a/contrib/src/deprecated/proplist.cpp b/contrib/src/deprecated/proplist.cpp
index 14da016986..2962502234 100644
--- a/contrib/src/deprecated/proplist.cpp
+++ b/contrib/src/deprecated/proplist.cpp
@@ -57,8 +57,10 @@
 #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); }
+#endif
 
 // ----------------------------------------------------------------------------
 // Property text edit control
diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
index d6ff9e7fe2..4c148bb008 100644
--- 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"
 
+#if !WXWIN_COMPATIBILITY_2_4
 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);
diff --git a/contrib/src/deprecated/wxexpr.cpp b/contrib/src/deprecated/wxexpr.cpp
index c859d8bccf..f8450343cb 100644
--- 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"
 
+#if !WXWIN_COMPATIBILITY_2_4
 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);