X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7463f75f9c170c29b4965d27dccf535ac32cfde..2934005d7daecb4343b394d9faabc86c8d04dca2:/utils/configtool/src/property.cpp

diff --git a/utils/configtool/src/property.cpp b/utils/configtool/src/property.cpp
index edaf2e31ec..4200ed6bea 100644
--- a/utils/configtool/src/property.cpp
+++ b/utils/configtool/src/property.cpp
@@ -7,14 +7,19 @@
 // Created:     2003-06-03
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	
+// Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "property.h"
 #endif
 
-#include "wx/wx.h"
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
 
 #include "property.h"
 
@@ -27,19 +32,23 @@ void ctProperties::AddProperty(ctProperty* property, const wxString& insertAfter
     if (oldProp)
         m_list.DeleteObject(oldProp);
 
-    wxNode* insertBeforeNode = NULL;
     if (insertAfter)
     {
         ctProperty* insertAfterProp = FindProperty(insertAfter);
         if (insertAfterProp)
         {
-            wxNode* node = m_list.Member(insertAfterProp);
+            wxObjectList::compatibility_iterator node = m_list.Member(insertAfterProp);
             if (node)
-                insertBeforeNode = node->GetNext();
+            {
+                wxObjectList::compatibility_iterator insertBeforeNode = node->GetNext();
+                m_list.Insert(insertBeforeNode, property);
+            }
+            else
+                m_list.Append(property);
         }
+        else
+            m_list.Append(property);
     }
-    if (insertBeforeNode)
-        m_list.Insert(insertBeforeNode, property);
     else
         m_list.Append(property);
 
@@ -68,7 +77,7 @@ void ctProperties::DeleteProperty(const wxString& name)
 
 ctProperty* ctProperties::FindProperty(const wxString& name) const
 {
-    wxNode* node = m_list.GetFirst();
+    wxObjectList::compatibility_iterator node = m_list.GetFirst();
     while (node)
     {
         ctProperty* prop = (ctProperty*) node->GetData();
@@ -111,14 +120,12 @@ ctProperty* ctProperties::FindOrCreateProperty(const wxString& name)
 
 void ctProperties::Clear()
 {
-    m_list.DeleteContents(TRUE);
-    m_list.Clear();
-    m_list.DeleteContents(FALSE);
+    WX_CLEAR_LIST(wxObjectList,m_list);
 }
 
 void ctProperties::Copy(const ctProperties& properties)
 {
-    wxNode* node = properties.m_list.GetFirst();
+    wxObjectList::compatibility_iterator node = properties.m_list.GetFirst();
     while (node)
     {
         ctProperty* prop = (ctProperty*) node->GetData();
@@ -144,7 +151,7 @@ void ctProperties::SetProperty(const wxString& name, long value)
 void ctProperties::SetProperty(const wxString& name, bool value)
 {
     ctProperty* prop = FindOrCreateProperty(name);
-    prop->GetVariant() = (bool) value;
+    prop->GetVariant() = value;
 }
 
 void ctProperties::SetProperty(const wxString& name, const wxVariant& value)
@@ -158,7 +165,7 @@ ctProperty* ctProperties::GetNth(int i) const
     wxASSERT( i < (int) GetCount() );
     if (i < (int) GetCount())
     {
-        wxNode* node = m_list.Nth(i);
+        wxObjectList::compatibility_iterator node = m_list.Item(i);
         return (ctProperty*) node->GetData();
     }
     return NULL;
@@ -229,4 +236,4 @@ void ctProperties::RemoveHiddenProperties()
         node = next;
     }
 }
-#endif
\ No newline at end of file
+#endif