utf8: Implemented further UTF8 support

[xestiacalendar/.git] / source / forms / calendareditor / frmCalendarEditor.cpp

diff --git a/source/forms/calendareditor/frmCalendarEditor.cpp b/source/forms/calendareditor/frmCalendarEditor.cpp
index 0373461..c885721 100644 (file)
--- a/source/forms/calendareditor/frmCalendarEditor.cpp
+++ b/source/forms/calendareditor/frmCalendarEditor.cpp
@@ -118,9 +118,9 @@ void frmCalendarEditor::ProcessCalendar( wxCommandEvent &event ){
        }
 
        calendarInfo->editMode = editMode;
-       calendarInfo->accountName = cmbAccount->GetStringSelection();
-       calendarInfo->calendarName = txtName->GetValue().ToStdString();
-       calendarInfo->calendarDescription = txtDescription->GetValue().ToStdString();
+       calendarInfo->accountName = std::string(cmbAccount->GetStringSelection().ToUTF8());
+       calendarInfo->calendarName = std::string(txtName->GetValue().ToUTF8());
+       calendarInfo->calendarDescription = std::string(txtDescription->GetValue().ToUTF8());
        
        calendarInfo->calendarColour = (clpColour->GetColour().GetAsString(wxC2S_HTML_SYNTAX).ToStdString() + "FF");
        
@@ -135,10 +135,10 @@ void frmCalendarEditor::ProcessCalendar( wxCommandEvent &event ){
 
 void frmCalendarEditor::SetData(int calendarID, std::string accountName, std::string calendarName, std::string calendarDescription, Colour calendarColour){
        
-       txtName->SetValue(wxString(calendarName.c_str()));
-       txtDescription->SetValue(wxString(calendarDescription.c_str()));        
+       txtName->SetValue(wxString(calendarName.c_str(), wxConvUTF8));
+       txtDescription->SetValue(wxString(calendarDescription.c_str(), wxConvUTF8));
        clpColour->SetColour(wxColour(calendarColour.red, calendarColour.green, calendarColour.blue));
-       cmbAccount->SetStringSelection(wxString(accountName));
+       cmbAccount->SetStringSelection(wxString(accountName.c_str(), wxConvUTF8));
        this->calendarID = calendarID;
        
 }
\ No newline at end of file