[OMPT-svn-commit] SF.net SVN: modplug:[5197] trunk/OpenMPT

[<man...@us...>]

Revision: 5197
          http://sourceforge.net/p/modplug/code/5197
Author:   manxorist
Date:     2015-05-27 22:35:54 +0000 (Wed, 27 May 2015)
Log Message:
-----------
[Ref] Repair MPT_USTRING_MODE_UTF8 compile.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_gen.cpp
    trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp
    trunk/OpenMPT/unarchiver/unzip.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.cpp	2015-05-26 21:16:52 UTC (rev 5196)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp	2015-05-27 22:35:54 UTC (rev 5197)
@@ -408,7 +408,7 @@
 {
 	if (!m_EditArtist.m_hWnd || !m_EditArtist.GetModify()) return;
 
-	std::wstring artist = GetWindowTextW(m_EditArtist);
+	mpt::ustring artist = mpt::ToUnicode(GetWindowTextW(m_EditArtist));
 	if(artist != m_sndFile.songArtist)
 	{
 		m_EditArtist.SetModify(FALSE);

Modified: trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp	2015-05-26 21:16:52 UTC (rev 5196)
+++ trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp	2015-05-27 22:35:54 UTC (rev 5197)
@@ -146,7 +146,7 @@
 void COptionsGeneral::OnOK()
 //--------------------------
 {
-	TrackerSettings::Instance().defaultArtist = GetWindowTextW(m_defaultArtist);
+	TrackerSettings::Instance().defaultArtist = mpt::ToUnicode(GetWindowTextW(m_defaultArtist));
 	TrackerSettings::Instance().defaultModType = static_cast<MODTYPE>(m_defaultFormat.GetItemData(m_defaultFormat.GetCurSel()));
 	TrackerSettings::Instance().defaultTemplateFile = mpt::PathString::FromNative(GetWindowTextW(m_defaultTemplate));
 

Modified: trunk/OpenMPT/unarchiver/unzip.cpp
===================================================================
--- trunk/OpenMPT/unarchiver/unzip.cpp	2015-05-26 21:16:52 UTC (rev 5196)
+++ trunk/OpenMPT/unarchiver/unzip.cpp	2015-05-27 22:35:54 UTC (rev 5197)
@@ -138,7 +138,7 @@
 				if(unzGetGlobalComment(zipFile, &commentData[0], info.size_comment) >= 0)
 				{
 					commentData[info.size_comment - 1] = '\0';
-					comment = mpt::ToWide(mpt::CharsetCP437, &commentData[0]);
+					comment = mpt::ToUnicode(mpt::CharsetCP437, &commentData[0]);
 				}
 			}
 		}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.