X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fforms%2Fcalendareditor%2FfrmCalendarEditor.cpp;h=c88572198c4a8b69427d524b1cd818676fe141cd;hp=03734617cbbc74970a5f2d802ed5666b9d66bb94;hb=a191ad71a0d6823b9710067c7cccf8905290dc9c;hpb=4ee1691d79d18f5a702f25e3ace79d4ab6049e23

diff --git a/source/forms/calendareditor/frmCalendarEditor.cpp b/source/forms/calendareditor/frmCalendarEditor.cpp
index 0373461..c885721 100644
--- 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