From 843703b175b227151371afc2f941b356207f03f3 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 10 May 2017 15:35:44 +0200 Subject: [PATCH 1/2] use lua_Integer --- src/gui/lua/lua_cc_window.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/lua/lua_cc_window.cpp b/src/gui/lua/lua_cc_window.cpp index 490a48e37..6249af866 100644 --- a/src/gui/lua/lua_cc_window.cpp +++ b/src/gui/lua/lua_cc_window.cpp @@ -89,7 +89,7 @@ int CLuaInstCCWindow::CCWindowNew(lua_State *L) tableLookup(L, "name", name) || tableLookup(L, "title", name) || tableLookup(L, "caption", name); tableLookup(L, "icon", icon); - int has_shadow = CC_SHADOW_OFF; + lua_Integer has_shadow = CC_SHADOW_OFF; if (!tableLookup(L, "has_shadow", has_shadow)) { tmp1 = "false"; if (tableLookup(L, "has_shadow", tmp1)) From 1b2f1d320db1cf2fbfc7a85fec81c23597d52580 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Thu, 11 May 2017 08:35:24 +0200 Subject: [PATCH 2/2] CComponentsHeader: fix brace error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit suggest explicit braces to avoid ambiguous ‘else’ --- src/gui/components/cc_frm_header.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp index da59a3b7f..ea3af35d4 100644 --- a/src/gui/components/cc_frm_header.cpp +++ b/src/gui/components/cc_frm_header.cpp @@ -330,10 +330,10 @@ void CComponentsHeader::initLogo() //set final logo position int x_logo = 0; if (cch_logo.Align == CC_LOGO_RIGHT){ - if (cch_caption_align == CTextBox::RIGHT) + if (cch_caption_align == CTextBox::RIGHT){ if (cch_text_obj) x_logo = cch_text_obj->getXPos() - cch_logo_obj->getWidth(); - else + }else x_logo = x_logo_right; } if (cch_logo.Align == CC_LOGO_LEFT)