From 3165574e2b41b35957948898eea890091974282f Mon Sep 17 00:00:00 2001 From: Myung Jin Kim Date: Mon, 8 Jul 2013 15:16:38 +0900 Subject: [PATCH] fix memleak for toolbar Change-Id: I17fb8bce90ef1ddc8797b3153b3009ed5485691a --- src/ui/controls/FUiCtrl_Toolbar.cpp | 56 ++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp index 11838eb..0b2e8cf 100644 --- a/src/ui/controls/FUiCtrl_Toolbar.cpp +++ b/src/ui/controls/FUiCtrl_Toolbar.cpp @@ -6014,26 +6014,26 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton) if (__style != TOOLBAR_SOFTKEY) { - //if (pNormalBackgroundEffectBitmap) - //{ + if (pNormalBackgroundEffectBitmap) + { // pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_NORMAL, *pNormalBackgroundEffectBitmap); - // delete pNormalBackgroundEffectBitmap; - //} - //if (pDisabledBackgroundEffectBitmap) - //{ + delete pNormalBackgroundEffectBitmap; + } + if (pDisabledBackgroundEffectBitmap) + { // pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_DISABLED, *pDisabledBackgroundEffectBitmap); - // delete pDisabledBackgroundEffectBitmap; - //} + delete pDisabledBackgroundEffectBitmap; + } if (pPressedBackgroundEffectBitmap) { pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_PRESSED, *pPressedBackgroundEffectBitmap); delete pPressedBackgroundEffectBitmap; } - //if (pHighlightedBackgroundEffectBitmap) - //{ + if (pHighlightedBackgroundEffectBitmap) + { // pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED, *pHighlightedBackgroundEffectBitmap); - // delete pHighlightedBackgroundEffectBitmap; - //} + delete pHighlightedBackgroundEffectBitmap; + } } if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE) @@ -6652,31 +6652,31 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton) if (__style != TOOLBAR_SOFTKEY) { - //if (pNormalBackgroundEffectBitmap) - //{ + if (pNormalBackgroundEffectBitmap) + { // pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_NORMAL, *pNormalBackgroundEffectBitmap); - // delete pNormalBackgroundEffectBitmap; - //} - //if (pDisabledBackgroundEffectBitmap) - //{ + delete pNormalBackgroundEffectBitmap; + } + if (pDisabledBackgroundEffectBitmap) + { // pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_DISABLED, *pDisabledBackgroundEffectBitmap); - // delete pDisabledBackgroundEffectBitmap; - //} + delete pDisabledBackgroundEffectBitmap; + } if (pPressedBackgroundEffectBitmap) { pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_PRESSED, *pPressedBackgroundEffectBitmap); delete pPressedBackgroundEffectBitmap; } - //if (pHighlightedBackgroundEffectBitmap) - //{ + if (pHighlightedBackgroundEffectBitmap) + { // pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED, *pHighlightedBackgroundEffectBitmap); - // delete pHighlightedBackgroundEffectBitmap; - //} - //if (pSelectedBackgroundEffectBitmap) - //{ + delete pHighlightedBackgroundEffectBitmap; + } + if (pSelectedBackgroundEffectBitmap) + { // pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_SELECTED, *pSelectedBackgroundEffectBitmap); - // delete pSelectedBackgroundEffectBitmap; - //} + delete pSelectedBackgroundEffectBitmap; + } } if (__style == TOOLBAR_TAB_LARGE || __style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE) -- 2.7.4