X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c74caa095c12410bd6a555df248699cb35821a8d..d1a6e2b7a103d761fbc15e0e9c1c20ab53a849d9:/contrib/src/deprecated/proplist.cpp

diff --git a/contrib/src/deprecated/proplist.cpp b/contrib/src/deprecated/proplist.cpp
index 14da016986..58cf7d29d8 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
@@ -1029,11 +1031,7 @@ bool wxBoolListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListVi
     return FALSE;
 
   wxString value(view->GetValueText()->GetValue());
-  bool boolValue = FALSE;
-  if (value == wxT("True"))
-    boolValue = TRUE;
-  else
-    boolValue = FALSE;
+  bool boolValue = (value == wxT("True"));
   property->GetValue() = (bool)boolValue;
   return TRUE;
 }
@@ -1256,7 +1254,7 @@ bool wxStringListValidator::OnDoubleClick( wxProperty *property,
     wxChar *s = node->GetData();
     if (wxStrcmp(s, currentString) == 0)
     {
-      wxChar *nextString = NULL;
+      wxChar *nextString;
       if (node->GetNext())
         nextString = node->GetNext()->GetData();
       else