Removal of first part of dsw files (as requested by Jamie Gadd).

[wxWidgets.git] / utils / configtool / src / configtooldoc.cpp

diff --git a/utils/configtool/src/configtooldoc.cpp b/utils/configtool/src/configtooldoc.cpp
index 30588737ae380edea0103b78d38499102786b296..ff3308f98c3a0e94973f254ae276ecab45a0c24e 100644 (file)
--- a/utils/configtool/src/configtooldoc.cpp
+++ b/utils/configtool/src/configtooldoc.cpp
@@ -9,27 +9,25 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "configtooldoc.h"
-#endif
-
-#include "wx/wx.h"
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 

-#include "wx/config.h"
-#include "wx/textfile.h"
+#ifndef WX_PRECOMP
+

 #include "wx/process.h"
 #include "wx/mimetype.h"
 #include "wx/process.h"
 #include "wx/process.h"
 #include "wx/mimetype.h"
 #include "wx/process.h"

-#include "wx/wfstream.h"

 
 

-#ifdef __BORLANDC__
-#pragma hdrstop

 #endif
 
 #endif
 

+#include "wx/textfile.h"
+#include "wx/txtstrm.h"
+#include "wx/wfstream.h"
+#include "wx/config.h"

 #include "configtooldoc.h"
 #include "configtoolview.h"
 #include "configtree.h"
 #include "configtooldoc.h"
 #include "configtoolview.h"
 #include "configtree.h"


@@ -90,26 +88,24 @@ bool ctConfigToolDoc::OnCloseDocument()
         UpdateAllViews (NULL, & hint);
 
         DeleteItems();
         UpdateAllViews (NULL, & hint);
 
         DeleteItems();

-        return TRUE;
+        return true;

     }
     else
     {
     }
     else
     {

-        return FALSE;
+        return false;

     }
 }
 
 // Saves the doc
 bool ctConfigToolDoc::Save()
 {
     }
 }
 
 // Saves the doc
 bool ctConfigToolDoc::Save()
 {

-    bool ret = FALSE;
+    if (!IsModified() && m_savedYet) return true;

 
 

-    if (!IsModified() && m_savedYet) return TRUE;
-    if (m_documentFile == wxT("") || !m_savedYet)
-        ret = SaveAs();
-    else
-        ret = OnSaveDocument(m_documentFile);
+    bool ret = (m_documentFile.empty() || !m_savedYet) ?
+                 SaveAs() :
+                 OnSaveDocument(m_documentFile);

     if ( ret )
     if ( ret )

-        SetDocumentSaved(TRUE);
+        SetDocumentSaved(true);

     return ret;
 }
 
     return ret;
 }
 


@@ -128,9 +124,9 @@ bool ctConfigToolDoc::OnCreate(const wxString& path, long flags)
         //rootItem->InitProperties();
         rootItem->GetProperties().AddProperty(
         new ctProperty(
         //rootItem->InitProperties();
         rootItem->GetProperties().AddProperty(
         new ctProperty(

-        wxT("The item description."),
-        wxVariant(wxT(""), wxT("description")),
-        wxT("multiline")));
+            wxT("The item description."),
+            wxVariant(wxEmptyString, wxT("description")),
+            wxT("multiline")));

 
         rootItem->SetPropertyString(_T("description"),
             _T("<B>This is the top-level configuration item.</B>"));
 
         rootItem->SetPropertyString(_T("description"),
             _T("<B>This is the top-level configuration item.</B>"));


@@ -138,8 +134,8 @@ bool ctConfigToolDoc::OnCreate(const wxString& path, long flags)
 
         SetTopItem(rootItem);
 
 
         SetTopItem(rootItem);
 

-        Modify(FALSE);
-        SetDocumentSaved(FALSE);
+        Modify(false);
+        SetDocumentSaved(false);

 
         wxString rootName(wxT("untitled"));
         wxStripExtension(rootName);
 
         wxString rootName(wxT("untitled"));
         wxStripExtension(rootName);


@@ -158,7 +154,7 @@ bool ctConfigToolDoc::OnCreate(const wxString& path, long flags)
             ctConfigToolHint hint(NULL, ctInitialUpdate);
             UpdateAllViews (NULL, & hint);
 
             ctConfigToolHint hint(NULL, ctInitialUpdate);
             UpdateAllViews (NULL, & hint);
 

-            SetFilename(GetFilename(), TRUE);
+            SetFilename(GetFilename(), true);

         }
     }
     return success;
         }
     }
     return success;


@@ -176,14 +172,14 @@ bool ctConfigToolDoc::OnSaveDocument(const wxString& filename)
     // This is the backup filename
     wxString backupFilename(filename);
     backupFilename += wxT(".bak");
     // This is the backup filename
     wxString backupFilename(filename);
     backupFilename += wxT(".bak");

-    
+

     // This is the temporary copy of the backup
     wxString tempFilename(filename);
     tempFilename += wxT(".tmp");
     if (wxFileExists(tempFilename))
         wxRemoveFile(tempFilename);
 
     // This is the temporary copy of the backup
     wxString tempFilename(filename);
     tempFilename += wxT(".tmp");
     if (wxFileExists(tempFilename))
         wxRemoveFile(tempFilename);
 

-    bool leaveBackup = TRUE;
+    bool leaveBackup = true;

 
     bool saved = DoSave(tempFilename);
 
 
     bool saved = DoSave(tempFilename);
 


@@ -194,7 +190,7 @@ bool ctConfigToolDoc::OnSaveDocument(const wxString& filename)
         {
             wxRemoveFile(backupFilename);
         }
         {
             wxRemoveFile(backupFilename);
         }

-        
+

         // Copy the old file to the .bak
 
         if (leaveBackup)
         // Copy the old file to the .bak
 
         if (leaveBackup)


@@ -213,17 +209,17 @@ bool ctConfigToolDoc::OnSaveDocument(const wxString& filename)
             if (wxFileExists(filename))
                 wxRemoveFile(filename);
         }
             if (wxFileExists(filename))
                 wxRemoveFile(filename);
         }

-        
+

         // Finally, copy the temporary file to the proper filename
         if (!wxRenameFile(tempFilename, filename))
         {
             wxCopyFile(tempFilename, filename);
             wxRemoveFile(tempFilename);
         // Finally, copy the temporary file to the proper filename
         if (!wxRenameFile(tempFilename, filename))
         {
             wxCopyFile(tempFilename, filename);
             wxRemoveFile(tempFilename);

-        }        
+        }

 
 

-        Modify(FALSE);
+        Modify(false);

         ((ctConfigToolView*)GetFirstView())->OnChangeFilename();
         ((ctConfigToolView*)GetFirstView())->OnChangeFilename();

-        SetDocumentSaved(TRUE);
+        SetDocumentSaved(true);

         SetFilename(filename);
         wxGetApp().GetSettings().m_lastFilename = filename;
     } else
         SetFilename(filename);
         wxGetApp().GetSettings().m_lastFilename = filename;
     } else


@@ -255,7 +251,7 @@ bool ctConfigToolDoc::OnOpenDocument(const wxString& filename)
         UpdateAllViews (NULL, & hint);
     }
 
         UpdateAllViews (NULL, & hint);
     }
 

-    SetDocumentSaved(TRUE); // Necessary or it will pop up the Save As dialog
+    SetDocumentSaved(true); // Necessary or it will pop up the Save As dialog

 
     return opened;
 }
 
     return opened;
 }


@@ -263,32 +259,36 @@ bool ctConfigToolDoc::OnOpenDocument(const wxString& filename)
 /// Save the settings file
 bool ctConfigToolDoc::DoSave(const wxString& filename)
 {
 /// Save the settings file
 bool ctConfigToolDoc::DoSave(const wxString& filename)
 {

-    wxFileOutputStream stream(filename);
-    if (!stream.Ok())
-        return FALSE;
+    wxFileOutputStream osFile(filename);
+    if (!osFile.Ok())
+        return false;
+
+    wxTextOutputStream stream(osFile);

 
     stream << wxT("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
 
     stream << wxT("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");

-    stream << wxT("<settings xmlns=\"http://www.wxwindows.org/wxs\" version=\"2.5.0.1\">");
+    stream << wxT("<settings xmlns=\"http://www.wxwidgets.org/wxs\" version=\"2.5.0.1\">");

 
 

-    DoSave(m_topItem, stream, 1);
+    DoSave(m_topItem, osFile, 1);

 
     stream << wxT("\n</settings>\n");
 
 
     stream << wxT("\n</settings>\n");
 

-    return TRUE;
+    return true;

 }
 
 }
 

-inline static void OutputIndentation(wxOutputStream& stream, int indent)
+inline static void OutputIndentation(wxOutputStream& osFile, int indent)

 {
 {

+    wxTextOutputStream stream(osFile);

     wxString str = wxT("\n");
     for (int i = 0; i < indent; i++)
     wxString str = wxT("\n");
     for (int i = 0; i < indent; i++)

-        str << wxT(' ') << wxT(' ');
+        str << wxT("  ");

     stream << str ;
 }
 
 /// Recursive helper function for file saving
     stream << str ;
 }
 
 /// Recursive helper function for file saving

-bool ctConfigToolDoc::DoSave(ctConfigItem* item, wxOutputStream& stream, int indent)
+bool ctConfigToolDoc::DoSave(ctConfigItem* item, wxOutputStream& osFile, int indent)

 {
 {

-    OutputIndentation(stream, indent*2);
+    OutputIndentation(osFile, indent*2);
+    wxTextOutputStream stream(osFile);

 
     wxString name(item->GetName());
     wxString s;
 
     wxString name(item->GetName());
     wxString s;


@@ -314,25 +314,25 @@ bool ctConfigToolDoc::DoSave(ctConfigItem* item, wxOutputStream& stream, int ind
 
     indent ++;
 
 
     indent ++;
 

-    OutputIndentation(stream, indent*2);
+    OutputIndentation(osFile, indent*2);

     if (item->IsActive())
         stream << wxT("<active>1</active>");
     else
         stream << wxT("<active>0</active>");
     if (item->IsActive())
         stream << wxT("<active>1</active>");
     else
         stream << wxT("<active>0</active>");

-    OutputIndentation(stream, indent*2);
+    OutputIndentation(osFile, indent*2);

     if (item->IsEnabled())
         stream << wxT("<enabled>1</enabled>");
     else
         stream << wxT("<enabled>0</enabled>");
 
     // Output properties
     if (item->IsEnabled())
         stream << wxT("<enabled>1</enabled>");
     else
         stream << wxT("<enabled>0</enabled>");
 
     // Output properties

-    wxNode* node = item->GetProperties().GetList().GetFirst();
+    wxObjectList::compatibility_iterator node = item->GetProperties().GetList().GetFirst();

     while (node)
     {
         ctProperty* prop = (ctProperty*) node->GetData();
     while (node)
     {
         ctProperty* prop = (ctProperty*) node->GetData();

-        OutputIndentation(stream, indent*2);
+        OutputIndentation(osFile, indent*2);

         stream << wxT("<") << prop->GetName() ;
         stream << wxT("<") << prop->GetName() ;

-        
+

         if (prop->IsCustom())
         {
             stream << wxT(" custom=\"true\"");
         if (prop->IsCustom())
         {
             stream << wxT(" custom=\"true\"");


@@ -346,7 +346,7 @@ bool ctConfigToolDoc::DoSave(ctConfigItem* item, wxOutputStream& stream, int ind
                 stream << wxT(" choices=\"") << choices << wxT("\"");
             }
         }
                 stream << wxT(" choices=\"") << choices << wxT("\"");
             }
         }

-        
+

         stream << wxT(">");
 
         stream << ctEscapeHTMLCharacters(prop->GetVariant().GetString()) ;
         stream << wxT(">");
 
         stream << ctEscapeHTMLCharacters(prop->GetVariant().GetString()) ;


@@ -360,17 +360,17 @@ bool ctConfigToolDoc::DoSave(ctConfigItem* item, wxOutputStream& stream, int ind
     while (node)
     {
         ctConfigItem* child = (ctConfigItem*) node->GetData();
     while (node)
     {
         ctConfigItem* child = (ctConfigItem*) node->GetData();

-        DoSave(child, stream, indent);
+        DoSave(child, osFile, indent);

 
         node = node->GetNext();
     }
 
     indent --;
 
 
         node = node->GetNext();
     }
 
     indent --;
 

-    OutputIndentation(stream, indent*2);
+    OutputIndentation(osFile, indent*2);

     stream << wxT("</setting>");
 
     stream << wxT("</setting>");
 

-    return TRUE;
+    return true;

 }
 
 /// Open the settings file
 }
 
 /// Open the settings file


@@ -391,20 +391,20 @@ bool ctConfigToolDoc::DoOpen(const wxString& filename)
                 wxSimpleHtmlTag* firstSettingTag = settingsTag->GetChildren();
                 if (firstSettingTag)
                     DoOpen(firstSettingTag, NULL);
                 wxSimpleHtmlTag* firstSettingTag = settingsTag->GetChildren();
                 if (firstSettingTag)
                     DoOpen(firstSettingTag, NULL);

-                return TRUE;
+                return true;

             }
             }

-            return TRUE;
+            return true;

         }
     }
         }
     }

-    return FALSE;
+    return false;

 }
 
 static bool GetHtmlBoolValue(const wxString& value)
 {
 }
 
 static bool GetHtmlBoolValue(const wxString& value)
 {

-    if (value == wxT("true") || value == wxT("TRUE") || value == wxT("1"))
-        return TRUE;
-     else
-         return FALSE;
+    if (value.IsSameAs(wxT("true"),false) || value == wxT("1"))
+        return true;
+    else
+        return false;

 }
 
 static int GetHtmlIntegerValue(const wxString& value)
 }
 
 static int GetHtmlIntegerValue(const wxString& value)


@@ -501,22 +501,22 @@ bool ctConfigToolDoc::DoOpen(wxSimpleHtmlTag* tag, ctConfigItem* parent)
                             wxString type(wxT("string"));
                             wxString choices;
                             wxString editorType(wxT("string"));
                             wxString type(wxT("string"));
                             wxString choices;
                             wxString editorType(wxT("string"));

-                            wxString description(wxT(""));
+                            wxString description;

                             childTag->GetAttributeValue(type, wxT("type"));
                             childTag->GetAttributeValue(type, wxT("editor-type"));
                             childTag->GetAttributeValue(type, wxT("choices"));
                             childTag->GetAttributeValue(description, wxT("description"));
 
                             if (type == wxT("bool"))
                             childTag->GetAttributeValue(type, wxT("type"));
                             childTag->GetAttributeValue(type, wxT("editor-type"));
                             childTag->GetAttributeValue(type, wxT("choices"));
                             childTag->GetAttributeValue(description, wxT("description"));
 
                             if (type == wxT("bool"))

-                                prop->GetVariant() = wxVariant((bool) FALSE, name);
+                                prop->GetVariant() = wxVariant(false, name);

                             else if (type == wxT("double"))
                                 prop->GetVariant() = wxVariant((double) 0.0, name);
                             else if (type == wxT("long"))
                                 prop->GetVariant() = wxVariant((long) 0, name);
                             else
                             else if (type == wxT("double"))
                                 prop->GetVariant() = wxVariant((double) 0.0, name);
                             else if (type == wxT("long"))
                                 prop->GetVariant() = wxVariant((long) 0, name);
                             else

-                                prop->GetVariant() = wxVariant(wxT(""), name);
+                                prop->GetVariant() = wxVariant(wxEmptyString, name);

                             prop->SetDescription(description);
                             prop->SetDescription(description);

-                            prop->SetCustom(TRUE);
+                            prop->SetCustom(true);

                             prop->SetEditorType(editorType);
                             if (!choices.IsEmpty())
                             {
                             prop->SetEditorType(editorType);
                             if (!choices.IsEmpty())
                             {


@@ -534,7 +534,7 @@ bool ctConfigToolDoc::DoOpen(wxSimpleHtmlTag* tag, ctConfigItem* parent)
                         else if (prop->GetVariant().GetType() == wxT("long"))
                             prop->GetVariant() = (long) GetHtmlIntegerValue(childTag->GetNext()->GetTagText());
                         else if (prop->GetVariant().GetType() == wxT("bool"))
                         else if (prop->GetVariant().GetType() == wxT("long"))
                             prop->GetVariant() = (long) GetHtmlIntegerValue(childTag->GetNext()->GetTagText());
                         else if (prop->GetVariant().GetType() == wxT("bool"))

-                            prop->GetVariant() = (bool) GetHtmlBoolValue(childTag->GetNext()->GetTagText());
+                            prop->GetVariant() = GetHtmlBoolValue(childTag->GetNext()->GetTagText());

                         else if (prop->GetVariant().GetType() == wxT("double"))
                             prop->GetVariant() = (double) GetHtmlDoubleValue(childTag->GetNext()->GetTagText());
                     }
                         else if (prop->GetVariant().GetType() == wxT("double"))
                             prop->GetVariant() = (double) GetHtmlDoubleValue(childTag->GetNext()->GetTagText());
                     }


@@ -543,17 +543,20 @@ bool ctConfigToolDoc::DoOpen(wxSimpleHtmlTag* tag, ctConfigItem* parent)
         }
         childTag = childTag->GetNext();
     }
         }
         childTag = childTag->GetNext();
     }

-    return TRUE;
+    return true;

 }
 
 /// Clear dependencies
 void ctConfigToolDoc::ClearDependencies(ctConfigItem* item)
 {
 }
 
 /// Clear dependencies
 void ctConfigToolDoc::ClearDependencies(ctConfigItem* item)
 {

-    if (!item)
+    if (!item) {

         item = GetTopItem();
         item = GetTopItem();

+        if (!item)
+            return;
+    }

 
     item->GetDependents().Clear();
 
     item->GetDependents().Clear();

-    for ( wxNode* node = item->GetChildren().GetFirst(); node; node = node->GetNext() )
+    for ( wxObjectList::compatibility_iterator node = item->GetChildren().GetFirst(); node; node = node->GetNext() )

     {
         ctConfigItem* child = (ctConfigItem*) node->GetData();
         ClearDependencies(child);
     {
         ctConfigItem* child = (ctConfigItem*) node->GetData();
         ClearDependencies(child);


@@ -570,6 +573,9 @@ void ctConfigToolDoc::RefreshDependencies()
 /// Refresh dependencies
 void ctConfigToolDoc::RefreshDependencies(ctConfigItem* item)
 {
 /// Refresh dependencies
 void ctConfigToolDoc::RefreshDependencies(ctConfigItem* item)
 {

+    if (item==NULL)
+        return;
+

     wxArrayString requiresArr;
     wxString requires = item->GetPropertyString(wxT("requires"));
     wxString precludes = item->GetPropertyString(wxT("precludes"));
     wxArrayString requiresArr;
     wxString requires = item->GetPropertyString(wxT("requires"));
     wxString precludes = item->GetPropertyString(wxT("precludes"));


@@ -597,7 +603,7 @@ void ctConfigToolDoc::RefreshDependencies(ctConfigItem* item)
     // parent is a check or radio group.
     ctConfigItem* parent = item->GetParent();
     if (parent &&
     // parent is a check or radio group.
     ctConfigItem* parent = item->GetParent();
     if (parent &&

-        (parent->GetType() == ctTypeCheckGroup || 
+        (parent->GetType() == ctTypeCheckGroup ||

         parent->GetType() == ctTypeRadioGroup))
         requiresArr.Add(parent->GetName());
 
         parent->GetType() == ctTypeRadioGroup))
         requiresArr.Add(parent->GetName());
 


@@ -618,7 +624,7 @@ void ctConfigToolDoc::RefreshDependencies(ctConfigItem* item)
             otherItem->GetDependents().Append(item);
         }
     }
             otherItem->GetDependents().Append(item);
         }
     }

-    for ( wxNode* node = item->GetChildren().GetFirst(); node; node = node->GetNext() )
+    for ( wxObjectList::compatibility_iterator node = item->GetChildren().GetFirst(); node; node = node->GetNext() )

     {
         ctConfigItem* child = (ctConfigItem*) node->GetData();
         RefreshDependencies(child);
     {
         ctConfigItem* child = (ctConfigItem*) node->GetData();
         RefreshDependencies(child);


@@ -667,7 +673,7 @@ void ctConfigToolDoc::GenerateSetup(ctConfigItem* item, wxString& str)
         }
     }
 
         }
     }
 

-    for ( wxNode* node = item->GetChildren().GetFirst(); node; node = node->GetNext() )
+    for ( wxObjectList::compatibility_iterator node = item->GetChildren().GetFirst(); node; node = node->GetNext() )

     {
         ctConfigItem* child = (ctConfigItem*) node->GetData();
         GenerateSetup(child, str);
     {
         ctConfigItem* child = (ctConfigItem*) node->GetData();
         GenerateSetup(child, str);


@@ -681,8 +687,8 @@ wxString ctConfigToolDoc::GenerateConfigureCommand()
     wxString str;
     str << wxT("# configurewx\n# Generated by wxConfigTool\n\n");
 
     wxString str;
     str << wxT("# configurewx\n# Generated by wxConfigTool\n\n");
 

-    wxString path = GetFrameworkDir(TRUE);
-    bool makeUnix = TRUE;
+    wxString path = GetFrameworkDir(true);
+    bool makeUnix = true;

     if (!path.IsEmpty())
     {
         if (makeUnix)
     if (!path.IsEmpty())
     {
         if (makeUnix)


@@ -697,7 +703,7 @@ wxString ctConfigToolDoc::GenerateConfigureCommand()
     ctConfigItem* platformsFolder = GetTopItem()->FindItem(wxT("Target"));
     if (platformsFolder)
     {
     ctConfigItem* platformsFolder = GetTopItem()->FindItem(wxT("Target"));
     if (platformsFolder)
     {

-        for ( wxNode* node = platformsFolder->GetChildren().GetFirst(); node; node = node->GetNext() )
+        for ( wxObjectList::compatibility_iterator node = platformsFolder->GetChildren().GetFirst(); node; node = node->GetNext() )

         {
             ctConfigItem* child = (ctConfigItem*) node->GetData();
             if (child->GetType() == ctTypeBoolRadio && child->IsEnabled())
         {
             ctConfigItem* child = (ctConfigItem*) node->GetData();
             if (child->GetType() == ctTypeBoolRadio && child->IsEnabled())


@@ -767,11 +773,11 @@ void ctConfigToolDoc::GenerateConfigureCommand(ctConfigItem* item, wxString& str
                 {
                     str << wxT(" ") << configureCommand;
                 }
                 {
                     str << wxT(" ") << configureCommand;
                 }

-            }            
+            }

         }
     }
 
         }
     }
 

-    for ( wxNode* node = item->GetChildren().GetFirst(); node; node = node->GetNext() )
+    for ( wxObjectList::compatibility_iterator node = item->GetChildren().GetFirst(); node; node = node->GetNext() )

     {
         ctConfigItem* child = (ctConfigItem*) node->GetData();
         GenerateConfigureCommand(child, str);
     {
         ctConfigItem* child = (ctConfigItem*) node->GetData();
         GenerateConfigureCommand(child, str);


@@ -786,10 +792,13 @@ wxString ctConfigToolDoc::GetFrameworkDir(bool makeUnix)
     {
         // Should probably allow other variables
         // to be used, and maybe expand variables within m_frameworkDir
     {
         // Should probably allow other variables
         // to be used, and maybe expand variables within m_frameworkDir

-        path = wxGetenv(wxT("WXWIN"));
+        wxString pathEnv(wxGetenv(wxT("WXWIN")));
+        path = pathEnv;

 #ifdef __WXMSW__
         if (makeUnix)
             path.Replace(wxT("\\"), wxT("/"));
 #ifdef __WXMSW__
         if (makeUnix)
             path.Replace(wxT("\\"), wxT("/"));

+#else
+        wxUnusedVar(makeUnix);

 #endif
     }
     return path;
 #endif
     }
     return path;


@@ -830,7 +839,7 @@ ctConfigItem* ctConfigToolDoc::FindNextSibling(ctConfigItem* item)
 {
     if (item->GetParent())
     {
 {
     if (item->GetParent())
     {

-        wxNode* node = item->GetParent()->GetChildren().Member(item);
+        wxObjectList::compatibility_iterator node = item->GetParent()->GetChildren().Member(item);

         if (node && node->GetNext())
         {
             ctConfigItem* nextItem = (ctConfigItem*) node->GetNext()->GetData();
         if (node && node->GetNext())
         {
             ctConfigItem* nextItem = (ctConfigItem*) node->GetNext()->GetData();


@@ -848,7 +857,7 @@ ctConfigItem* ctConfigToolDoc::FindNextSibling(ctConfigItem* item)
 ctConfigCommand::ctConfigCommand(const wxString& name, int cmdId,
         ctConfigItem* activeState, ctConfigItem* savedState,
         ctConfigItem* parent, ctConfigItem* insertBefore,
 ctConfigCommand::ctConfigCommand(const wxString& name, int cmdId,
         ctConfigItem* activeState, ctConfigItem* savedState,
         ctConfigItem* parent, ctConfigItem* insertBefore,

-        bool ignoreFirstTime): wxCommand(TRUE, name)
+        bool ignoreFirstTime): wxCommand(true, name)

 {
     m_activeState = activeState;
     m_savedState = savedState;
 {
     m_activeState = activeState;
     m_savedState = savedState;


@@ -861,7 +870,7 @@ ctConfigCommand::ctConfigCommand(const wxString& name, int cmdId,
 
 ctConfigCommand::ctConfigCommand(const wxString& name, int cmdId,
         ctConfigItem* activeState,  ctProperties* properties,
 
 ctConfigCommand::ctConfigCommand(const wxString& name, int cmdId,
         ctConfigItem* activeState,  ctProperties* properties,

-        bool ignoreFirstTime): wxCommand(TRUE, name)
+        bool ignoreFirstTime): wxCommand(true, name)

 {
     m_activeState = activeState;
     m_savedState = NULL;
 {
     m_activeState = activeState;
     m_savedState = NULL;


@@ -883,12 +892,12 @@ ctConfigCommand::~ctConfigCommand()
 
 bool ctConfigCommand::Do()
 {
 
 bool ctConfigCommand::Do()
 {

-    return DoAndUndo(TRUE);
+    return DoAndUndo(true);

 }
 
 bool ctConfigCommand::Undo()
 {
 }
 
 bool ctConfigCommand::Undo()
 {

-    return DoAndUndo(FALSE);
+    return DoAndUndo(false);

 }
 
 // Combine Do and Undo into one
 }
 
 // Combine Do and Undo into one


@@ -908,7 +917,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
 
                 // This will delete the old clipboard contents, if any.
                 doc->SetClipboardItem(newItem);
 
                 // This will delete the old clipboard contents, if any.
                 doc->SetClipboardItem(newItem);

-                
+

                 m_parent = m_activeState->GetParent();
                 m_insertBefore = m_activeState->FindNextSibling();
 
                 m_parent = m_activeState->GetParent();
                 m_insertBefore = m_activeState->FindNextSibling();
 


@@ -916,7 +925,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
                 m_savedState = m_activeState;
                 m_activeState = NULL;
 
                 m_savedState = m_activeState;
                 m_activeState = NULL;
 

-                m_savedState->GetDocument()->Modify(TRUE);
+                m_savedState->GetDocument()->Modify(true);

                 ctConfigToolView* view = (ctConfigToolView*) m_savedState->GetDocument()->GetFirstView();
                 view->OnChangeFilename();
             }
                 ctConfigToolView* view = (ctConfigToolView*) m_savedState->GetDocument()->GetFirstView();
                 view->OnChangeFilename();
             }


@@ -925,7 +934,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
                 wxASSERT(m_savedState != NULL);
                 wxASSERT(m_activeState == NULL);
 
                 wxASSERT(m_savedState != NULL);
                 wxASSERT(m_activeState == NULL);
 

-                m_savedState->GetDocument()->Modify(TRUE);
+                m_savedState->GetDocument()->Modify(true);

                 m_savedState->Attach(m_parent, m_insertBefore);
                 ctConfigToolView* view = (ctConfigToolView*) m_savedState->GetDocument()->GetFirstView();
                 view->AddItems(wxGetApp().GetMainFrame()->GetConfigTreeCtrl(), m_savedState);
                 m_savedState->Attach(m_parent, m_insertBefore);
                 ctConfigToolView* view = (ctConfigToolView*) m_savedState->GetDocument()->GetFirstView();
                 view->AddItems(wxGetApp().GetMainFrame()->GetConfigTreeCtrl(), m_savedState);


@@ -944,7 +953,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
                 wxASSERT(m_savedState != NULL);
                 wxASSERT(m_activeState == NULL);
 
                 wxASSERT(m_savedState != NULL);
                 wxASSERT(m_activeState == NULL);
 

-                m_savedState->GetDocument()->Modify(TRUE);
+                m_savedState->GetDocument()->Modify(true);

                 m_savedState->Attach(m_parent, m_insertBefore);
                 ctConfigToolView* view = (ctConfigToolView*) m_savedState->GetDocument()->GetFirstView();
                 view->AddItems(wxGetApp().GetMainFrame()->GetConfigTreeCtrl(), m_savedState);
                 m_savedState->Attach(m_parent, m_insertBefore);
                 ctConfigToolView* view = (ctConfigToolView*) m_savedState->GetDocument()->GetFirstView();
                 view->AddItems(wxGetApp().GetMainFrame()->GetConfigTreeCtrl(), m_savedState);


@@ -958,7 +967,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
                 wxASSERT(m_savedState == NULL);
                 wxASSERT(m_activeState != NULL);
 
                 wxASSERT(m_savedState == NULL);
                 wxASSERT(m_activeState != NULL);
 

-                m_activeState->GetDocument()->Modify(TRUE);
+                m_activeState->GetDocument()->Modify(true);

                 ctConfigToolView* view = (ctConfigToolView*) m_activeState->GetDocument()->GetFirstView();
                 m_activeState->Detach();
                 m_savedState = m_activeState;
                 ctConfigToolView* view = (ctConfigToolView*) m_activeState->GetDocument()->GetFirstView();
                 m_activeState->Detach();
                 m_savedState = m_activeState;


@@ -974,7 +983,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
                 wxASSERT(m_savedState != NULL);
                 wxASSERT(m_activeState == NULL);
 
                 wxASSERT(m_savedState != NULL);
                 wxASSERT(m_activeState == NULL);
 

-                m_savedState->GetDocument()->Modify(TRUE);
+                m_savedState->GetDocument()->Modify(true);

                 m_savedState->Attach(m_parent, m_insertBefore);
                 ctConfigToolView* view = (ctConfigToolView*) m_savedState->GetDocument()->GetFirstView();
                 view->AddItems(wxGetApp().GetMainFrame()->GetConfigTreeCtrl(), m_savedState);
                 m_savedState->Attach(m_parent, m_insertBefore);
                 ctConfigToolView* view = (ctConfigToolView*) m_savedState->GetDocument()->GetFirstView();
                 view->AddItems(wxGetApp().GetMainFrame()->GetConfigTreeCtrl(), m_savedState);


@@ -988,7 +997,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
                 wxASSERT(m_savedState == NULL);
                 wxASSERT(m_activeState != NULL);
 
                 wxASSERT(m_savedState == NULL);
                 wxASSERT(m_activeState != NULL);
 

-                m_activeState->GetDocument()->Modify(TRUE);
+                m_activeState->GetDocument()->Modify(true);

                 m_activeState->Detach();
                 m_savedState = m_activeState;
                 m_activeState = NULL;
                 m_activeState->Detach();
                 m_savedState = m_activeState;
                 m_activeState = NULL;


@@ -1012,7 +1021,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
 
                 // Apply only those that need applying
                 // (those properties in activeState that are not in propsTemp)
 
                 // Apply only those that need applying
                 // (those properties in activeState that are not in propsTemp)

-                wxNode* node = m_activeState->GetProperties().GetList().GetFirst();
+                wxObjectList::compatibility_iterator node = m_activeState->GetProperties().GetList().GetFirst();

                 while (node)
                 {
                     ctProperty* prop = (ctProperty*) node->GetData();
                 while (node)
                 {
                     ctProperty* prop = (ctProperty*) node->GetData();


@@ -1023,7 +1032,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
                     }
                     node = node->GetNext();
                 }
                     }
                     node = node->GetNext();
                 }

-                m_activeState->GetDocument()->Modify(TRUE);
+                m_activeState->GetDocument()->Modify(true);

                 ctConfigToolView* view = (ctConfigToolView*) m_activeState->GetDocument()->GetFirstView();
                 if (view)
                 {
                 ctConfigToolView* view = (ctConfigToolView*) m_activeState->GetDocument()->GetFirstView();
                 if (view)
                 {


@@ -1031,12 +1040,12 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
                     m_activeState->GetDocument()->UpdateAllViews (NULL, & hint);
                 }
             }
                     m_activeState->GetDocument()->UpdateAllViews (NULL, & hint);
                 }
             }

-            m_ignoreThis = FALSE;
+            m_ignoreThis = false;

 
             break;
         }
     }
 
             break;
         }
     }

-    return TRUE;
+    return true;

 }
 
 IMPLEMENT_CLASS(ctConfiguration, wxObject)
 }
 
 IMPLEMENT_CLASS(ctConfiguration, wxObject)


@@ -1076,7 +1085,7 @@ ctConfiguration::~ctConfiguration()
             wxGetApp().GetMainFrame()->GetDocument()->SetTopItem(NULL);
     }
 */
             wxGetApp().GetMainFrame()->GetDocument()->SetTopItem(NULL);
     }
 */

-    
+

     Clear();
 }
 
     Clear();
 }
 


@@ -1090,10 +1099,10 @@ void ctConfiguration::operator= (const ctConfiguration& configuration)
 /// Clear children
 void ctConfiguration::Clear()
 {
 /// Clear children
 void ctConfiguration::Clear()
 {

-    wxNode* node = m_children.GetFirst();
+    wxObjectList::compatibility_iterator node = m_children.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxNode* next = node->GetNext();
+        wxObjectList::compatibility_iterator next = node->GetNext();

         ctConfiguration* child = (ctConfiguration*) node->GetData();
 
         // This should delete 'node' too, assuming
         ctConfiguration* child = (ctConfiguration*) node->GetData();
 
         // This should delete 'node' too, assuming


@@ -1155,7 +1164,7 @@ ctConfiguration* ctConfiguration::FindConfiguration(const wxString& name)
     if (GetName() == name)
         return this;
 
     if (GetName() == name)
         return this;
 

-    for ( wxNode* node = GetChildren().GetFirst(); node; node = node->GetNext() )
+    for ( wxObjectList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext() )

     {
         ctConfiguration* child = (ctConfiguration*) node->GetData();
         ctConfiguration* found = child->FindConfiguration(name);
     {
         ctConfiguration* child = (ctConfiguration*) node->GetData();
         ctConfiguration* found = child->FindConfiguration(name);


@@ -1170,7 +1179,7 @@ ctConfiguration* ctConfiguration::FindNextSibling()
 {
     if (!GetParent())
         return NULL;
 {
     if (!GetParent())
         return NULL;

-    wxNode* node = GetParent()->GetChildren().Member(this);
+    wxObjectList::compatibility_iterator node = GetParent()->GetChildren().Member(this);

     if (node && node->GetNext())
     {
         return (ctConfiguration*) node->GetNext()->GetData();
     if (node && node->GetNext())
     {
         return (ctConfiguration*) node->GetNext()->GetData();


@@ -1183,7 +1192,7 @@ ctConfiguration* ctConfiguration::FindPreviousSibling()
 {
     if (!GetParent())
         return NULL;
 {
     if (!GetParent())
         return NULL;

-    wxNode* node = GetParent()->GetChildren().Member(this);
+    wxObjectList::compatibility_iterator node = GetParent()->GetChildren().Member(this);

     if (node && node->GetPrevious())
     {
         return (ctConfiguration*) node->GetPrevious()->GetData();
     if (node && node->GetPrevious())
     {
         return (ctConfiguration*) node->GetPrevious()->GetData();


@@ -1196,7 +1205,7 @@ ctConfiguration* ctConfiguration::DeepClone()
 {
     ctConfiguration* newItem = Clone();
 
 {
     ctConfiguration* newItem = Clone();
 

-    for ( wxNode* node = GetChildren().GetFirst(); node; node = node->GetNext() )
+    for ( wxObjectList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext() )

     {
         ctConfiguration* child = (ctConfiguration*) node->GetData();
         ctConfiguration* newChild = child->DeepClone();
     {
         ctConfiguration* child = (ctConfiguration*) node->GetData();
         ctConfiguration* newChild = child->DeepClone();


@@ -1244,5 +1253,3 @@ void ctConfiguration::DetachFromTree()
     }
 */
 }
     }
 */
 }

-
-