Win32: implement further UTF8 support

[xestiacalendar/.git] / source / objects / calendarlist / CalendarList.cpp

diff --git a/source/objects/calendarlist/CalendarList.cpp b/source/objects/calendarlist/CalendarList.cpp
index 514b3e6..403270c 100644 (file)
--- a/source/objects/calendarlist/CalendarList.cpp
+++ b/source/objects/calendarlist/CalendarList.cpp
@@ -1,6 +1,6 @@
 // CalendarList.cpp - Account calendar list.
 //
-// (c) 2016 Xestia Software Development.
+// (c) 2016-2017 Xestia Software Development.
 //
 // This file is part of Xestia Calendar.
 //
@@ -26,7 +26,7 @@ XCAccountCalendarList::XCAccountCalendarList(string calendarListFilename){
        
        wxString calendarListFilenameFull;
        
-       calendarListFilenameFull.Append(calendarListFilename);
+       calendarListFilenameFull.Append(wxString(calendarListFilename.c_str(), wxConvUTF8));
        calendarListFilenameFull.Append(wxT("/calendarlist.db"));
 
        wxFileConfig *calendarListFile = new wxFileConfig("", "", calendarListFilenameFull);
@@ -46,13 +46,13 @@ XCAccountCalendarList::XCAccountCalendarList(string calendarListFilename){
                
                calendarListFile->SetPath(accountName);
 
-               calendarShortName.push_back(string(accountName.mb_str()));
+               calendarShortName.push_back(string(accountName.ToUTF8()));
                
                calendarListFile->Read(wxT("name"), &valueData);
-               calendarName.push_back(string(valueData.mb_str()));
+               calendarName.push_back(string(valueData.ToUTF8()));
 
                calendarListFile->Read(wxT("description"), &valueData);
-               calendarDescription.push_back(string(valueData.mb_str()));
+               calendarDescription.push_back(string(valueData.ToUTF8()));
 
                calendarListFile->Read(wxT("colour"), &valueData);
                colourData = string(valueData.mb_str());