Remove build warning
authorkeonpyo.kong <keonpyo.kong@samsung.com>
Tue, 2 Apr 2013 08:36:52 +0000 (17:36 +0900)
committerkeonpyo.kong <keonpyo.kong@samsung.com>
Tue, 2 Apr 2013 09:50:40 +0000 (18:50 +0900)
Change-Id: I80e668734df97df6d5a7880c64958032e2e1fc3b
Signed-off-by: keonpyo.kong <keonpyo.kong@samsung.com>
src/ui/FUi_Control.cpp

index 46fe25d..ff6efa9 100755 (executable)
@@ -2528,7 +2528,7 @@ _Control::GetFallbackFont(void)
        if (!(__isControlFontChanged || pControlManager->IsDefaultFontChanged())\r
                && __pFont != null\r
                && ((__pFont->GetSize() == textSize || __pFont->GetSizeF() == floatTextSize))\r
-               && (pFontImpl->GetStyle() == style))\r
+               && (pFontImpl->GetStyle() == static_cast<int>(style)))\r
        {\r
                return __pFont;\r
        }\r
@@ -3782,6 +3782,8 @@ _Control::_Control(void)
        , __pDetectStartedGestureMap(null)\r
        , __pDelayedTouchInfoList(null)\r
        , __touchMoveAllowance(3)\r
+       , __inputLockRefCount(0)\r
+       , __screenDpi(0)\r
        , __isSentDelayedEvent(false)\r
        , __isSendingDelayedEvent(false)\r
        , __isChangingEventTarget(false)\r
@@ -3796,9 +3798,6 @@ _Control::_Control(void)
        , __fontFileName(L"")\r
        , __pPreviousFocus(null)\r
        , __pNextFocus(null)\r
-       , __pFocusVisualElement(null)\r
-       , __inputLockRefCount(0)\r
-       , __screenDpi(0)\r
 {\r
        ClearLastResult();\r
 \r