X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71ada1a5fbecf774be6cb7ab7421a8f784d6c84c..f530fa27a92ea58071c83aa7bfe0a859626b39e7:/utils/configtool/src/configtooldoc.cpp?ds=sidebyside

diff --git a/utils/configtool/src/configtooldoc.cpp b/utils/configtool/src/configtooldoc.cpp
index a2875fc05e..122bd5926a 100644
--- a/utils/configtool/src/configtooldoc.cpp
+++ b/utils/configtool/src/configtooldoc.cpp
@@ -13,23 +13,24 @@
 #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
 
-#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/wfstream.h"
 
-#ifdef __BORLANDC__
-#pragma hdrstop
 #endif
 
+#include "wx/textfile.h"
+#include "wx/wfstream.h"
+#include "wx/config.h"
 #include "configtooldoc.h"
 #include "configtoolview.h"
 #include "configtree.h"
@@ -90,26 +91,24 @@ bool ctConfigToolDoc::OnCloseDocument()
         UpdateAllViews (NULL, & hint);
 
         DeleteItems();
-        return TRUE;
+        return true;
     }
     else
     {
-        return FALSE;
+        return false;
     }
 }
 
 // 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 == wxT("") || !m_savedYet) ?
+                 SaveAs() :
+                 OnSaveDocument(m_documentFile);
     if ( ret )
-        SetDocumentSaved(TRUE);
+        SetDocumentSaved(true);
     return ret;
 }
 
@@ -138,8 +137,8 @@ bool ctConfigToolDoc::OnCreate(const wxString& path, long flags)
 
         SetTopItem(rootItem);
 
-        Modify(FALSE);
-        SetDocumentSaved(FALSE);
+        Modify(false);
+        SetDocumentSaved(false);
 
         wxString rootName(wxT("untitled"));
         wxStripExtension(rootName);
@@ -158,7 +157,7 @@ bool ctConfigToolDoc::OnCreate(const wxString& path, long flags)
             ctConfigToolHint hint(NULL, ctInitialUpdate);
             UpdateAllViews (NULL, & hint);
 
-            SetFilename(GetFilename(), TRUE);
+            SetFilename(GetFilename(), true);
         }
     }
     return success;
@@ -183,7 +182,7 @@ bool ctConfigToolDoc::OnSaveDocument(const wxString& filename)
     if (wxFileExists(tempFilename))
         wxRemoveFile(tempFilename);
 
-    bool leaveBackup = TRUE;
+    bool leaveBackup = true;
 
     bool saved = DoSave(tempFilename);
 
@@ -221,9 +220,9 @@ bool ctConfigToolDoc::OnSaveDocument(const wxString& filename)
             wxRemoveFile(tempFilename);
         }        
 
-        Modify(FALSE);
+        Modify(false);
         ((ctConfigToolView*)GetFirstView())->OnChangeFilename();
-        SetDocumentSaved(TRUE);
+        SetDocumentSaved(true);
         SetFilename(filename);
         wxGetApp().GetSettings().m_lastFilename = filename;
     } else
@@ -255,7 +254,7 @@ bool ctConfigToolDoc::OnOpenDocument(const wxString& filename)
         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;
 }
@@ -265,16 +264,16 @@ bool ctConfigToolDoc::DoSave(const wxString& filename)
 {
     wxFileOutputStream stream(filename);
     if (!stream.Ok())
-        return FALSE;
+        return false;
 
     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);
 
     stream << wxT("\n</settings>\n");
 
-    return TRUE;
+    return true;
 }
 
 inline static void OutputIndentation(wxOutputStream& stream, int indent)
@@ -326,7 +325,7 @@ bool ctConfigToolDoc::DoSave(ctConfigItem* item, wxOutputStream& stream, int ind
         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();
@@ -370,7 +369,7 @@ bool ctConfigToolDoc::DoSave(ctConfigItem* item, wxOutputStream& stream, int ind
     OutputIndentation(stream, indent*2);
     stream << wxT("</setting>");
 
-    return TRUE;
+    return true;
 }
 
 /// Open the settings file
@@ -391,20 +390,20 @@ bool ctConfigToolDoc::DoOpen(const wxString& filename)
                 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)
 {
     if (value == wxT("true") || value == wxT("TRUE") || value == wxT("1"))
-        return TRUE;
+        return true;
      else
-         return FALSE;
+         return false;
 }
 
 static int GetHtmlIntegerValue(const wxString& value)
@@ -508,7 +507,7 @@ bool ctConfigToolDoc::DoOpen(wxSimpleHtmlTag* tag, ctConfigItem* parent)
                             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"))
@@ -516,7 +515,7 @@ bool ctConfigToolDoc::DoOpen(wxSimpleHtmlTag* tag, ctConfigItem* parent)
                             else
                                 prop->GetVariant() = wxVariant(wxT(""), name);
                             prop->SetDescription(description);
-                            prop->SetCustom(TRUE);
+                            prop->SetCustom(true);
                             prop->SetEditorType(editorType);
                             if (!choices.IsEmpty())
                             {
@@ -534,7 +533,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"))
-                            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());
                     }
@@ -543,7 +542,7 @@ bool ctConfigToolDoc::DoOpen(wxSimpleHtmlTag* tag, ctConfigItem* parent)
         }
         childTag = childTag->GetNext();
     }
-    return TRUE;
+    return true;
 }
 
 /// Clear dependencies
@@ -553,7 +552,7 @@ void ctConfigToolDoc::ClearDependencies(ctConfigItem* item)
         item = GetTopItem();
 
     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);
@@ -618,7 +617,7 @@ void ctConfigToolDoc::RefreshDependencies(ctConfigItem* 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);
@@ -667,7 +666,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);
@@ -681,8 +680,8 @@ wxString ctConfigToolDoc::GenerateConfigureCommand()
     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)
@@ -697,7 +696,7 @@ wxString ctConfigToolDoc::GenerateConfigureCommand()
     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())
@@ -771,7 +770,7 @@ void ctConfigToolDoc::GenerateConfigureCommand(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();
         GenerateConfigureCommand(child, str);
@@ -786,7 +785,8 @@ wxString ctConfigToolDoc::GetFrameworkDir(bool makeUnix)
     {
         // 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("/"));
@@ -830,7 +830,7 @@ ctConfigItem* ctConfigToolDoc::FindNextSibling(ctConfigItem* item)
 {
     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();
@@ -848,7 +848,7 @@ ctConfigItem* ctConfigToolDoc::FindNextSibling(ctConfigItem* item)
 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;
@@ -861,7 +861,7 @@ ctConfigCommand::ctConfigCommand(const wxString& name, int cmdId,
 
 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;
@@ -883,12 +883,12 @@ ctConfigCommand::~ctConfigCommand()
 
 bool ctConfigCommand::Do()
 {
-    return DoAndUndo(TRUE);
+    return DoAndUndo(true);
 }
 
 bool ctConfigCommand::Undo()
 {
-    return DoAndUndo(FALSE);
+    return DoAndUndo(false);
 }
 
 // Combine Do and Undo into one
@@ -916,7 +916,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
                 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();
             }
@@ -925,7 +925,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
                 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);
@@ -944,7 +944,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
                 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);
@@ -958,7 +958,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
                 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;
@@ -974,7 +974,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
                 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);
@@ -988,7 +988,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
                 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;
@@ -1012,7 +1012,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
 
                 // 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();
@@ -1023,7 +1023,7 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
                     }
                     node = node->GetNext();
                 }
-                m_activeState->GetDocument()->Modify(TRUE);
+                m_activeState->GetDocument()->Modify(true);
                 ctConfigToolView* view = (ctConfigToolView*) m_activeState->GetDocument()->GetFirstView();
                 if (view)
                 {
@@ -1031,12 +1031,12 @@ bool ctConfigCommand::DoAndUndo(bool doCmd)
                     m_activeState->GetDocument()->UpdateAllViews (NULL, & hint);
                 }
             }
-            m_ignoreThis = FALSE;
+            m_ignoreThis = false;
 
             break;
         }
     }
-    return TRUE;
+    return true;
 }
 
 IMPLEMENT_CLASS(ctConfiguration, wxObject)
@@ -1090,10 +1090,10 @@ void ctConfiguration::operator= (const ctConfiguration& configuration)
 /// Clear children
 void ctConfiguration::Clear()
 {
-    wxNode* node = m_children.GetFirst();
+    wxObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {
-        wxNode* next = node->GetNext();
+        wxObjectList::compatibility_iterator next = node->GetNext();
         ctConfiguration* child = (ctConfiguration*) node->GetData();
 
         // This should delete 'node' too, assuming
@@ -1155,7 +1155,7 @@ ctConfiguration* ctConfiguration::FindConfiguration(const wxString& name)
     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);
@@ -1170,7 +1170,7 @@ ctConfiguration* ctConfiguration::FindNextSibling()
 {
     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();
@@ -1183,7 +1183,7 @@ ctConfiguration* ctConfiguration::FindPreviousSibling()
 {
     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();
@@ -1196,7 +1196,7 @@ ctConfiguration* ctConfiguration::DeepClone()
 {
     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();
@@ -1229,10 +1229,10 @@ void ctConfiguration::Detach()
 /// the config items
 void ctConfiguration::DetachFromTree()
 {
+/*
     wxTreeItemId item = GetTreeItemId();
 
     // TODO
-/*
     ctTreeItemData* data = (ctTreeItemData*) wxGetApp().GetMainFrame()->GetConfigTreeCtrl()->GetItemData(item);
     data->SetConfigItem(NULL);
     m_treeItemId = wxTreeItemId();