Fixes tex2rtf to search for files on current folder too. This is basically to test...

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

diff --git a/utils/configtool/src/configtoolview.cpp b/utils/configtool/src/configtoolview.cpp
index 6cd42bc8faded61c77c8956f031b553554919e66..0005f52690322178235ca5f62d2819846b859e13 100644 (file)
--- a/utils/configtool/src/configtoolview.cpp
+++ b/utils/configtool/src/configtoolview.cpp
@@ -9,10 +9,6 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "configtoolview.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"
 


@@ -21,6 +17,7 @@
 #endif
 
 #include "wx/wfstream.h"
 #endif
 
 #include "wx/wfstream.h"

+#include "wx/txtstrm.h"

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


@@ -259,7 +256,7 @@ void ctConfigToolView::SyncItem(ctConfigTreeCtrl* treeControl, ctConfigItem* ite
     {
         if (!item->GetParent())
         {
     {
         if (!item->GetParent())
         {

-            item->SetTreeItem(treeControl->AddRoot(_(""), -1, -1, new ctTreeItemData(item)));
+            item->SetTreeItem(treeControl->AddRoot(wxEmptyString, -1, -1, new ctTreeItemData(item)));

         }
         else
         {
         }
         else
         {


@@ -423,9 +420,8 @@ void ctConfigToolView::AddItem(ctConfigType type, const wxString& msg)
     ctConfigItem* sel = GetSelection();
     if (sel)
     {
     ctConfigItem* sel = GetSelection();
     if (sel)
     {

-        wxString name = wxGetTextFromUser(_("Please enter a name for the new item."),
-            msg, wxT(""));
-        if (!name.IsEmpty())
+        wxString name = wxGetTextFromUser(_("Please enter a name for the new item."), msg);
+        if (!name.empty())

         {
             ctConfigItem* parent ;
             ctConfigItem* insertBefore ;
         {
             ctConfigItem* parent ;
             ctConfigItem* insertBefore ;


@@ -474,7 +470,7 @@ void ctConfigToolView::OnRenameItem(wxCommandEvent& WXUNUSED(event))
     {
         wxString name = wxGetTextFromUser(_("Please enter a new name for the item."),
             _("Rename item"), sel->GetName());
     {
         wxString name = wxGetTextFromUser(_("Please enter a new name for the item."),
             _("Rename item"), sel->GetName());

-        if (!name.IsEmpty())
+        if (!name.empty())

         {
             sel->SetName(name);
             SyncItem(wxGetApp().GetMainFrame()->GetConfigTreeCtrl(), sel);
         {
             sel->SetName(name);
             SyncItem(wxGetApp().GetMainFrame()->GetConfigTreeCtrl(), sel);


@@ -686,7 +682,7 @@ void ctConfigToolView::OnItemHelp(wxCommandEvent& WXUNUSED(event))
     if ( doc && GetSelection() )
     {
         wxString helpTopic = GetSelection()->GetPropertyString(wxT("help-topic"));
     if ( doc && GetSelection() )
     {
         wxString helpTopic = GetSelection()->GetPropertyString(wxT("help-topic"));

-        if (!helpTopic.IsEmpty())
+        if (!helpTopic.empty())

         {
             wxGetApp().GetReferenceHelpController().DisplaySection(helpTopic);
         }
         {
             wxGetApp().GetReferenceHelpController().DisplaySection(helpTopic);
         }


@@ -732,7 +728,7 @@ void ctConfigToolView::OnAddCustomProperty(wxCommandEvent& WXUNUSED(event))
             else if (type == wxT("long"))
                 property->GetVariant() = wxVariant((long) 0, name);
             else
             else if (type == wxT("long"))
                 property->GetVariant() = wxVariant((long) 0, name);
             else

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

             property->SetCustom(true);
             property->SetDescription(descr);
             property->SetChoices(choices);
             property->SetCustom(true);
             property->SetDescription(descr);
             property->SetChoices(choices);


@@ -791,7 +787,7 @@ void ctConfigToolView::OnEditCustomProperty(wxCommandEvent& WXUNUSED(event))
                     else if (type == wxT("long"))
                         property->GetVariant() = wxVariant((long) 0, name);
                     else
                     else if (type == wxT("long"))
                         property->GetVariant() = wxVariant((long) 0, name);
                     else

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

                 }
                 if (name != oldName)
                     property->GetVariant().SetName(name);
                 }
                 if (name != oldName)
                     property->GetVariant().SetName(name);


@@ -910,27 +906,28 @@ void ctConfigToolView::OnSaveSetupFile(wxCommandEvent& WXUNUSED(event))
 
     wxString filename = _T("setup.h");
     wxString path = wxGetApp().GetSettings().m_lastSetupSaveDir;
 
     wxString filename = _T("setup.h");
     wxString path = wxGetApp().GetSettings().m_lastSetupSaveDir;

-    if (path.IsEmpty())
+    if (path.empty())

         path = doc->GetFrameworkDir(false);
     wxString wildcard = _T("Header files (*.h)|*.h|All files (*.*)|*.*");
 
     wxFileDialog dialog(wxTheApp->GetTopWindow(),
         _("Save Setup File As"),
         path, filename ,
         path = doc->GetFrameworkDir(false);
     wxString wildcard = _T("Header files (*.h)|*.h|All files (*.*)|*.*");
 
     wxFileDialog dialog(wxTheApp->GetTopWindow(),
         _("Save Setup File As"),
         path, filename ,

-        wildcard, wxSAVE|wxOVERWRITE_PROMPT);
+        wildcard, wxFD_SAVE|wxFD_OVERWRITE_PROMPT);

 
     if (dialog.ShowModal() == wxID_OK)
     {
         wxString fullPath = dialog.GetPath();
         wxGetApp().GetSettings().m_lastSetupSaveDir = wxPathOnly(fullPath);
 
 
     if (dialog.ShowModal() == wxID_OK)
     {
         wxString fullPath = dialog.GetPath();
         wxGetApp().GetSettings().m_lastSetupSaveDir = wxPathOnly(fullPath);
 

-        wxFileOutputStream stream(fullPath);
-        if (!stream.Ok())
+        wxFileOutputStream osFile(fullPath);
+        if (!osFile.Ok())

         {
             wxMessageBox(_("Sorry, could not save this file."), _("Save Setup File"), wxICON_EXCLAMATION|wxOK);
             return;
         }
 
         {
             wxMessageBox(_("Sorry, could not save this file."), _("Save Setup File"), wxICON_EXCLAMATION|wxOK);
             return;
         }
 

+        wxTextOutputStream stream(osFile);

         stream << setupStr;
     }
 }
         stream << setupStr;
     }
 }


@@ -942,27 +939,28 @@ void ctConfigToolView::OnSaveConfigureCommand(wxCommandEvent& WXUNUSED(event))
 
     wxString filename = _T("configurewx.sh");
     wxString path = wxGetApp().GetSettings().m_lastSetupSaveDir;
 
     wxString filename = _T("configurewx.sh");
     wxString path = wxGetApp().GetSettings().m_lastSetupSaveDir;

-    if (path.IsEmpty())
+    if (path.empty())

         path = doc->GetFrameworkDir(false);
     wxString wildcard = _T("Shell script files (*.sh)|*.sh|All files (*.*)|*.*");
 
     wxFileDialog dialog(wxTheApp->GetTopWindow(),
         _("Save Configure Command File As"),
         path, filename ,
         path = doc->GetFrameworkDir(false);
     wxString wildcard = _T("Shell script files (*.sh)|*.sh|All files (*.*)|*.*");
 
     wxFileDialog dialog(wxTheApp->GetTopWindow(),
         _("Save Configure Command File As"),
         path, filename ,

-        wildcard, wxSAVE|wxOVERWRITE_PROMPT);
+        wildcard, wxFD_SAVE|wxFD_OVERWRITE_PROMPT);

 
     if (dialog.ShowModal() == wxID_OK)
     {
         wxString fullPath = dialog.GetPath();
         wxGetApp().GetSettings().m_lastSetupSaveDir = wxPathOnly(fullPath);
 
 
     if (dialog.ShowModal() == wxID_OK)
     {
         wxString fullPath = dialog.GetPath();
         wxGetApp().GetSettings().m_lastSetupSaveDir = wxPathOnly(fullPath);
 

-        wxFileOutputStream stream(fullPath);
-        if (!stream.Ok())
+        wxFileOutputStream osFile(fullPath);
+        if (!osFile.Ok())

         {
             wxMessageBox(_("Sorry, could not save this file."), _("Save Configure Command File"), wxICON_EXCLAMATION|wxOK);
             return;
         }
 
         {
             wxMessageBox(_("Sorry, could not save this file."), _("Save Configure Command File"), wxICON_EXCLAMATION|wxOK);
             return;
         }
 

+        wxTextOutputStream stream(osFile);

         stream << configureStr;
     }
 }
         stream << configureStr;
     }
 }


@@ -1014,7 +1012,7 @@ void ctConfigToolView::OnGo(wxCommandEvent& WXUNUSED(event))
 {
     ctConfigToolDoc* doc = (ctConfigToolDoc*) GetDocument();
     wxString path = wxGetApp().GetSettings().m_lastSetupSaveDir;
 {
     ctConfigToolDoc* doc = (ctConfigToolDoc*) GetDocument();
     wxString path = wxGetApp().GetSettings().m_lastSetupSaveDir;

-    if (!path.IsEmpty())
+    if (!path.empty())

     {
         if (wxGetApp().GetSettings().m_defaultFileKind == wxT("Setup file"))
         {
     {
         if (wxGetApp().GetSettings().m_defaultFileKind == wxT("Setup file"))
         {


@@ -1075,7 +1073,7 @@ void ctConfigToolView::OnGo(wxCommandEvent& WXUNUSED(event))
 void ctConfigToolView::OnUpdateGo(wxUpdateUIEvent& event)
 {
     wxString path = wxGetApp().GetSettings().m_lastSetupSaveDir;
 void ctConfigToolView::OnUpdateGo(wxUpdateUIEvent& event)
 {
     wxString path = wxGetApp().GetSettings().m_lastSetupSaveDir;

-    event.Enable(!path.IsEmpty());
+    event.Enable(!path.empty());

 }
 
 //----------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------


@@ -1132,7 +1130,7 @@ bool ctFindReplaceDialog::DoFind(const wxString& textToFind, bool matchCase, boo
             return false;
     }
 
             return false;
     }
 

-    if (!sm_currentItem.IsEmpty())
+    if (!sm_currentItem.empty())

     {
         currentItem = doc->GetTopItem()->FindItem(sm_currentItem);
     }
     {
         currentItem = doc->GetTopItem()->FindItem(sm_currentItem);
     }