Code cleanup.

This commit is contained in:
spx
2011-02-15 16:26:54 +00:00
parent 1ba57f2adf
commit fe9fd9f476
55 changed files with 156 additions and 190 deletions

View File

@ -39,7 +39,7 @@ enum BUTTON_STATE
** The constructor
**
*/
CMeterButton::CMeterButton(CMeterWindow* meterWindow) : CMeter(meterWindow),
CMeterButton::CMeterButton(CMeterWindow* meterWindow, const WCHAR* name) : CMeter(meterWindow, name),
m_Image(L"ButtonImage", NULL, true),
m_NeedsReload(false),
m_Bitmaps(),
@ -136,7 +136,7 @@ void CMeterButton::Initialize()
** Read the meter-specific configs from the ini-file.
**
*/
void CMeterButton::ReadConfig(const WCHAR* section)
void CMeterButton::ReadConfig(CConfigParser& parser, const WCHAR* section)
{
// Store the current values so we know if the image needs to be updated
std::wstring oldImageName = m_ImageName;
@ -144,9 +144,7 @@ void CMeterButton::ReadConfig(const WCHAR* section)
int oldH = m_H;
// Read common configs
CMeter::ReadConfig(section);
CConfigParser& parser = m_MeterWindow->GetParser();
CMeter::ReadConfig(parser, section);
m_ImageName = parser.ReadString(section, L"ButtonImage", L"");
if (!m_ImageName.empty())