Reverted the changes from r209.

This commit is contained in:
Kimmo Pekkola
2009-09-04 16:37:51 +00:00
parent 8239919333
commit 4bf4e51126
16 changed files with 116 additions and 136 deletions

View File

@ -197,9 +197,9 @@ void CMeterImage::ReadConfig(const WCHAR* section)
CConfigParser& parser = m_MeterWindow->GetParser();
m_ImageName = parser.ReadString(section, L"ImageName", parser.ReadString(m_StyleName.c_str(), L"ImageName", L"").c_str(),true,true);
m_ImageName = parser.ReadString(section, L"ImageName", L"");
m_Path = parser.ReadString(section, L"Path", parser.ReadString(m_StyleName.c_str(), L"Path", L"").c_str(),true,true);
m_Path = parser.ReadString(section, L"Path", L"");
if (!m_Path.empty())
{
if (m_Path[m_Path.length() - 1] != L'\\')
@ -209,7 +209,7 @@ void CMeterImage::ReadConfig(const WCHAR* section)
}
m_ImageName = m_MeterWindow->MakePathAbsolute(m_Path + m_ImageName);
m_PreserveAspectRatio = 0!=parser.ReadInt(section, L"PreserveAspectRatio", 0!=parser.ReadInt(m_StyleName.c_str(), L"PreserveAspectRatio", 0));
m_PreserveAspectRatio = 0!=parser.ReadInt(section, L"PreserveAspectRatio", 0);
if (-1 != parser.ReadInt(section, L"W", -1))
{