From 34ef065188cd3986130015de03045baa3839c7f2 Mon Sep 17 00:00:00 2001 From: "keonpyo.kong" Date: Tue, 2 Apr 2013 17:36:52 +0900 Subject: [PATCH] Remove build warning Change-Id: I80e668734df97df6d5a7880c64958032e2e1fc3b Signed-off-by: keonpyo.kong --- src/ui/FUi_Control.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ui/FUi_Control.cpp b/src/ui/FUi_Control.cpp index 46fe25d..ff6efa9 100755 --- a/src/ui/FUi_Control.cpp +++ b/src/ui/FUi_Control.cpp @@ -2528,7 +2528,7 @@ _Control::GetFallbackFont(void) if (!(__isControlFontChanged || pControlManager->IsDefaultFontChanged()) && __pFont != null && ((__pFont->GetSize() == textSize || __pFont->GetSizeF() == floatTextSize)) - && (pFontImpl->GetStyle() == style)) + && (pFontImpl->GetStyle() == static_cast(style))) { return __pFont; } @@ -3782,6 +3782,8 @@ _Control::_Control(void) , __pDetectStartedGestureMap(null) , __pDelayedTouchInfoList(null) , __touchMoveAllowance(3) + , __inputLockRefCount(0) + , __screenDpi(0) , __isSentDelayedEvent(false) , __isSendingDelayedEvent(false) , __isChangingEventTarget(false) @@ -3796,9 +3798,6 @@ _Control::_Control(void) , __fontFileName(L"") , __pPreviousFocus(null) , __pNextFocus(null) - , __pFocusVisualElement(null) - , __inputLockRefCount(0) - , __screenDpi(0) { ClearLastResult(); -- 2.7.4