X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcommon%2Ftextprocessing.cpp;h=b9832e55c3331dfee7ccf4bf1861a42a54bfd577;hb=cd8780939e5a806f34a03b86a3e10f26666180d1;hp=aeec7a80661e5f0c7728a6ca4efcab68220a2aa7;hpb=f3a1da85c5a6cc49e275330ef5e66b156622034b;p=xestiaab%2F.git diff --git a/source/common/textprocessing.cpp b/source/common/textprocessing.cpp index aeec7a8..b9832e5 100644 --- a/source/common/textprocessing.cpp +++ b/source/common/textprocessing.cpp @@ -26,6 +26,8 @@ void EscapeString(wxString *ReceivedString, bool StripQuotes) { + // Escape a string that contains escapable characters. + ReceivedString->Replace(wxT("\\"), wxT("\\\\"), TRUE); ReceivedString->Replace(wxT(","), wxT("\\,"), TRUE); ReceivedString->Replace(wxT(";"), wxT("\\;"), TRUE); @@ -43,6 +45,8 @@ void EscapeString(wxString *ReceivedString, bool StripQuotes) void GetEscapeString(wxTextCtrl *TextCtrl, wxString *ProcessString, bool StripQuotes) { + // Get an escaped string from a wxTextCtrl. + *ProcessString = TextCtrl->GetValue(); EscapeString(ProcessString, StripQuotes); @@ -51,6 +55,8 @@ void GetEscapeString(wxTextCtrl *TextCtrl, wxString *ProcessString, bool StripQu void GetEscapeString(wxComboBox *ComboCtrl, wxString *ProcessString, bool StripQuotes) { + // Get an escaped string from a wxComboBox. + *ProcessString = ComboCtrl->GetValue(); EscapeString(ProcessString, StripQuotes); @@ -59,6 +65,8 @@ void GetEscapeString(wxComboBox *ComboCtrl, wxString *ProcessString, bool StripQ void GetEscapeString(wxChoice *ChoiceCtrl, wxString *ProcessString, bool StripQuotes) { + // Get an escaped string from a wxChoice. + *ProcessString = ChoiceCtrl->GetString(ChoiceCtrl->GetSelection()); EscapeString(ProcessString, StripQuotes); @@ -67,6 +75,8 @@ void GetEscapeString(wxChoice *ChoiceCtrl, wxString *ProcessString, bool StripQu void CaptureString(wxString *ProcessString, bool StripQuotes) { + // Capture a string for processing. + ProcessString->Replace(wxT("\\n"), wxT("\n"), TRUE); ProcessString->Replace(wxT("\\;"), wxT(";"), TRUE); ProcessString->Replace(wxT("\\,"), wxT(","), TRUE); @@ -83,6 +93,8 @@ void CaptureString(wxString *ProcessString, bool StripQuotes) void ResetUnusedString(wxString *ProcessString) { + // Reset an unused string. + ProcessString->Replace(wxT("\\\\"), wxT("\\"), TRUE); ProcessString->Replace(wxT("\n"), wxT(""), TRUE); ProcessString->Replace(wxT("\\;"), wxT(";"), TRUE); @@ -93,6 +105,9 @@ void ResetUnusedString(wxString *ProcessString) void ConvertToHTML(wxString *ProcessString) { + // Convert string into text that can be used with a + // wxHTMLWindow. + ProcessString->Replace(wxT("&"), wxT("&"), TRUE); ProcessString->Replace(wxT("<"), wxT("<"), TRUE); ProcessString->Replace(wxT(">"), wxT(">"), TRUE); @@ -101,23 +116,41 @@ void ConvertToHTML(wxString *ProcessString) } void DeleteMapDataProcess(int IndexNum, std::map* MapData){ + + // Delete map data (for map). + MapData->erase(IndexNum); + } void DeleteMapDataProcess(int IndexNum, std::map* MapData){ + + // Delete map data (for map). + MapData->erase(IndexNum); + } void DeleteMapDataProcess(int IndexNum, std::map* MapData){ + + // Delete map data (for map). + MapData->erase(IndexNum); + } void DeleteMapDataProcess(int IndexNum, std::map* MapData){ + + // Delete map data (for map). + MapData->erase(IndexNum); + } bool MapDataExists(int *ItemIndex, std::map *MapPtr){ + // Check if map data exists (for map). + if (MapPtr->find(*ItemIndex) == MapPtr->end()){ return FALSE; @@ -132,6 +165,8 @@ bool MapDataExists(int *ItemIndex, std::map *MapPtr){ bool MapDataExists(int *ItemIndex, std::map *MapPtr){ + // Check if map data exists (for map). + if (MapPtr->find(*ItemIndex) == MapPtr->end()){ return FALSE;