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 7754ba4ced79535bc69f5aad2b9af0ef5d78d5d4..ff3308f98c3a0e94973f254ae276ecab45a0c24e 100644 (file)
--- a/utils/configtool/src/configtooldoc.cpp
+++ b/utils/configtool/src/configtooldoc.cpp
@@ -9,10 +9,6 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "configtooldoc.h"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -105,7 +101,7 @@ bool ctConfigToolDoc::Save()
 {
     if (!IsModified() && m_savedYet) return true;
 
 {
     if (!IsModified() && m_savedYet) return true;
 

-    bool ret = (m_documentFile == wxT("") || !m_savedYet) ?
+    bool ret = (m_documentFile.empty() || !m_savedYet) ?

                  SaveAs() :
                  OnSaveDocument(m_documentFile);
     if ( ret )
                  SaveAs() :
                  OnSaveDocument(m_documentFile);
     if ( 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>"));


@@ -505,7 +501,7 @@ 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(type, wxT("type"));
                             childTag->GetAttributeValue(type, wxT("editor-type"));
                             childTag->GetAttributeValue(type, wxT("choices"));


@@ -518,7 +514,7 @@ bool ctConfigToolDoc::DoOpen(wxSimpleHtmlTag* tag, ctConfigItem* parent)
                             else if (type == wxT("long"))
                                 prop->GetVariant() = wxVariant((long) 0, name);
                             else
                             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->SetCustom(true);
                             prop->SetEditorType(editorType);
                             prop->SetDescription(description);
                             prop->SetCustom(true);
                             prop->SetEditorType(editorType);


@@ -801,6 +797,8 @@ wxString ctConfigToolDoc::GetFrameworkDir(bool makeUnix)
 #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;