From 86c462eb4de3b33304cad7e59a74e2d787efe3d0 Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Wed, 6 Feb 2013 18:48:23 -0200 Subject: [PATCH] Fix win32 compile errors --- src/framework/platform/win32window.cpp | 4 ++-- src/framework/ui/uiwidgetbasestyle.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/framework/platform/win32window.cpp b/src/framework/platform/win32window.cpp index 68a81ec4..6e3de22e 100644 --- a/src/framework/platform/win32window.cpp +++ b/src/framework/platform/win32window.cpp @@ -236,7 +236,7 @@ void WIN32Window::terminate() } if(m_instance) { - if(!UnregisterClassA(g_app.getCompactName(), m_instance)) + if(!UnregisterClassA(g_app.getCompactName().c_str(), m_instance)) g_logger.error("UnregisterClassA failed"); m_instance = NULL; } @@ -262,7 +262,7 @@ void WIN32Window::internalCreateWindow() wc.hCursor = m_defaultCursor; wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH); wc.lpszMenuName = NULL; - wc.lpszClassName = g_app.getCompactName(); + wc.lpszClassName = g_app.getCompactName().c_str(); if(!RegisterClassA(&wc)) g_logger.fatal("Failed to register the window class."); diff --git a/src/framework/ui/uiwidgetbasestyle.cpp b/src/framework/ui/uiwidgetbasestyle.cpp index dc52e3eb..8d51a1c4 100644 --- a/src/framework/ui/uiwidgetbasestyle.cpp +++ b/src/framework/ui/uiwidgetbasestyle.cpp @@ -392,8 +392,8 @@ void UIWidget::drawIcon(const Rect& screenCoords) drawRect.moveCenter(screenCoords.center()); else drawRect.alignIn(screenCoords, m_iconAlign); - drawRect.translate(m_iconOffset); } + drawRect.translate(m_iconOffset); g_painter->setColor(m_iconColor); g_painter->drawTexturedRect(drawRect, m_icon, m_iconClipRect); }