Fix win32 compile errors

This commit is contained in:
Eduardo Bart 2013-02-06 18:48:23 -02:00
parent 7ece0ed8c7
commit 86c462eb4d
2 changed files with 3 additions and 3 deletions

View File

@ -236,7 +236,7 @@ void WIN32Window::terminate()
} }
if(m_instance) { if(m_instance) {
if(!UnregisterClassA(g_app.getCompactName(), m_instance)) if(!UnregisterClassA(g_app.getCompactName().c_str(), m_instance))
g_logger.error("UnregisterClassA failed"); g_logger.error("UnregisterClassA failed");
m_instance = NULL; m_instance = NULL;
} }
@ -262,7 +262,7 @@ void WIN32Window::internalCreateWindow()
wc.hCursor = m_defaultCursor; wc.hCursor = m_defaultCursor;
wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH); wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH);
wc.lpszMenuName = NULL; wc.lpszMenuName = NULL;
wc.lpszClassName = g_app.getCompactName(); wc.lpszClassName = g_app.getCompactName().c_str();
if(!RegisterClassA(&wc)) if(!RegisterClassA(&wc))
g_logger.fatal("Failed to register the window class."); g_logger.fatal("Failed to register the window class.");

View File

@ -392,8 +392,8 @@ void UIWidget::drawIcon(const Rect& screenCoords)
drawRect.moveCenter(screenCoords.center()); drawRect.moveCenter(screenCoords.center());
else else
drawRect.alignIn(screenCoords, m_iconAlign); drawRect.alignIn(screenCoords, m_iconAlign);
drawRect.translate(m_iconOffset);
} }
drawRect.translate(m_iconOffset);
g_painter->setColor(m_iconColor); g_painter->setColor(m_iconColor);
g_painter->drawTexturedRect(drawRect, m_icon, m_iconClipRect); g_painter->drawTexturedRect(drawRect, m_icon, m_iconClipRect);
} }