deprecate back and remove menu

author Myung Jin Kim <critical.kim@samsung.com>

Thu, 20 Jun 2013 12:58:24 +0000 (21:58 +0900)

committer Myung Jin Kim <critical.kim@samsung.com>

Thu, 20 Jun 2013 12:58:24 +0000 (21:58 +0900)
author Myung Jin Kim <critical.kim@samsung.com>
Thu, 20 Jun 2013 12:58:24 +0000 (21:58 +0900)
committer Myung Jin Kim <critical.kim@samsung.com>
Thu, 20 Jun 2013 12:58:24 +0000 (21:58 +0900)
diff --git a/inc/FUiCtrlFooter.h b/inc/FUiCtrlFooter.h

index 0405061..b12cf06 100644 (file)
--- a/inc/FUiCtrlFooter.h
+++ b/inc/FUiCtrlFooter.h
@@ -119,16 +119,6 @@ enum FooterStyle
   * }
   * @endcode
   *
- * -Using the back button
- * The image of back button is internally set by UI framework.
- *
- * @code
- * bool
- * TestForm::Initialize(void)
- * {
- *      pFooter->SetBackButton();
- * }
- * @endcode
   */
  class _OSP_EXPORT_ Footer
         : public Tizen::Ui::Control
@@ -194,6 +184,9 @@ public:
         /**
          * Checks whether the back button item is set.
          *
+        * @brief       <i> [Deprecated] </i>
+        * @deprecated  This method is deprecated because hardware back key is mandatory for Tizen mobile devices. @n
+        *              This method is not guaranteed to work properly.
          * @since               2.0
          *
          * @return              @c true if the back button item is set, @n
@@ -264,6 +257,9 @@ public:
         /**
          * Gets the state of the back button.
          *
+        * @brief       <i> [Deprecated] </i>
+        * @deprecated  This method is deprecated because hardware back key is mandatory for Tizen mobile devices. @n
+        *              This method is not guaranteed to work properly.
          * @since       2.0
          *
          * @return      The state of the back button, @n
@@ -403,6 +399,9 @@ public:
         /**
          * Removes the back button item.
          *
+        * @brief       <i> [Deprecated] </i>
+        * @deprecated  This method is deprecated because hardware back key is mandatory for Tizen mobile devices. @n
+        *              This method is not guaranteed to work properly.
          * @since               2.0
          *
          * @return      An error code
@@ -509,6 +508,9 @@ public:
         /**
          * Enables or disables the back button.
          *
+        * @brief       <i> [Deprecated] </i>
+        * @deprecated  This method is deprecated because hardware back key is mandatory for Tizen mobile devices. @n
+        *              This method is not guaranteed to work properly.
          * @since               2.0
          *
          * @return      An error code
@@ -570,6 +572,9 @@ public:
         /**
          * Sets the back button.
          *
+        * @brief       <i> [Deprecated] </i>
+        * @deprecated  This method is deprecated because hardware back key is mandatory for Tizen mobile devices. @n
+        *              This method is not guaranteed to work properly.
          * @since       2.0
          *
          * @return      An error code
@@ -801,76 +806,6 @@ public:
         Tizen::Graphics::FloatRectangle GetButtonBoundsF(ButtonPosition position) const;
  
  
-       /**
-        * Checks whether the Menu button item is set.
-        *
-        * @since               2.2
-        *
-        * @return      @c true if the Menu button item is set, @n
-        *              else @c false
-        */
-       bool IsMenuButtonSet(void) const;
-
-
-       /**
-        * Gets the state of the Menu button.
-        *
-        * @since       2.2
-        *
-        * @return      The state of the Menu button, @n
-        *              else @c BUTTON_ITEM_STATUS_NORMAL if an error occurs
-        * @exception   E_SUCCESS           The method is successful.
-        * @exception   E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation. @n
-        *                                                      The Menu button is not set.
-        * @remarks     The specific error code can be accessed using the GetLastResult() method.
-        */
-       ButtonItemStatus GetMenuButtonStatus(void) const;
-
-
-       /**
-        * Removes the Menu button item.
-        *
-        * @since        2.2
-        *
-        * @return       An error code
-        * @exception    E_SUCCESS              The method is successful.
-        * @exception    E_SYSTEM               This exception exists only for historical reason.
-        * @remarks      This method always returns E_SUCCESS.
-        */
-       result RemoveMenuButton(void);
-
-
-       /**
-        * Enables or disables the Menu button.
-        *
-        * @since       2.2
-        *
-        * @return      An error code
-        * @param[in]   enable                   Set to @c true to enable the Menu button, @n
-        *                                       else @c false
-        * @exception   E_SUCCESS                The method is successful.
-        * @exception   E_INVALID_OPERATION  The current state of the instance prohibits the execution of the specified operation. @n
-        *                                       The Menu button item is not set.
-        */
-       result SetMenuButtonEnabled(bool enable);
-
-
-       /**
-        * Sets the Menu button.
-        *
-        * @since       2.2
-        *
-        * @return      An error code
-        * @exception   E_SUCCESS                       The method is successful.
-        * @exception   E_INVALID_OPERATION             This exception is returned when there are more than 3 footer items.
-        * @exception   E_UNSUPPORTED_OPERATION         This operation is not supported. @n
-        *                                              The operation is not supported when the style of the %Footer control is ::FOOTER_STYLE_TAB or ::FOOTER_STYLE_TAB_LARGE.
-        * @exception   E_SYSTEM                                A System error has occurred.
-        * @remarks     If the left button is already set, then the button is replaced with the Menu button.
-        */
-       result SetMenuButton(void);
-
-
  protected:
         //
         //This method is for internal use only. Using this method can cause behavioral, security-related,
diff --git a/inc/FUiCtrlHeader.h b/inc/FUiCtrlHeader.h

index 354d3ec..90ce58f 100644 (file)
--- a/inc/FUiCtrlHeader.h
+++ b/inc/FUiCtrlHeader.h
@@ -913,6 +913,9 @@ public:
         /**
         * Sets the back button.
         *
+       * @brief        <i> [Deprecated] </i>
+       * @deprecated   This method is deprecated because hardware back key is mandatory for Tizen mobile devices. @n
+       *               This method is not guaranteed to work properly.
         * @since                2.0
         *
         * @return       An error code
@@ -928,6 +931,9 @@ public:
         /**
         * Checks whether the back button item is set.
         *
+       * @brief        <i> [Deprecated] </i>
+       * @deprecated   This method is deprecated because hardware back key is mandatory for Tizen mobile devices. @n
+       *               This method is not guaranteed to work properly.
         * @since                2.0
         *
         * @return               @c true if the back button item is set, @n
@@ -939,6 +945,9 @@ public:
         /**
         * Removes the back button item.
         *
+       * @brief        <i> [Deprecated] </i>
+       * @deprecated   This method is deprecated because hardware back key is mandatory for Tizen mobile devices. @n
+       *               This method is not guaranteed to work properly.
         * @since                2.0
         *
         */
@@ -948,6 +957,9 @@ public:
         /**
         * Enables or disables the back button.
         *
+       * @brief        <i> [Deprecated] </i>
+       * @deprecated   This method is deprecated because hardware back key is mandatory for Tizen mobile devices. @n
+       *               This method is not guaranteed to work properly.
         * @since                2.0
         *
         * @return       An error code
@@ -963,6 +975,9 @@ public:
         /**
         * Gets the state of the back button.
         *
+       * @brief        <i> [Deprecated] </i>
+       * @deprecated   This method is deprecated because hardware back key is mandatory for Tizen mobile devices. @n
+       *               This method is not guaranteed to work properly.
         * @since                2.0
         *
         * @return       The state of the back button, @n
diff --git a/src/ui/controls/FUiCtrlFooter.cpp b/src/ui/controls/FUiCtrlFooter.cpp

index f3ffee4..2eff980 100644 (file)
--- a/src/ui/controls/FUiCtrlFooter.cpp
+++ b/src/ui/controls/FUiCtrlFooter.cpp
@@ -571,63 +571,4 @@ Footer::SetButtonNumberedBadgeIcon(ButtonPosition position, int number)
         return pFooterImpl->SetButtonNumberedBadgeIcon(position, number);
  }
  
-bool
-Footer::IsMenuButtonSet(void) const
-{
-       ClearLastResult();
-
-       const _FooterImpl* pFooterImpl = _FooterImpl::GetInstance(*this);
-
-       SysAssertf(pFooterImpl != null,
-                                       "Not yet constructed. Construct() should be called before use.");
-
-       return pFooterImpl->IsMenuButtonSet();
-}
-
-ButtonItemStatus
-Footer::GetMenuButtonStatus(void) const
-{
-       ClearLastResult();
-
-       const _FooterImpl* pFooterImpl = _FooterImpl::GetInstance(*this);
-
-       SysAssertf(pFooterImpl != null,
-                                       "Not yet constructed. Construct() should be called before use.");
-
-       return pFooterImpl->GetMenuButtonStatus();
-}
-
-result
-Footer::RemoveMenuButton(void)
-{
-       _FooterImpl* pFooterImpl = _FooterImpl::GetInstance(*this);
-
-       SysAssertf(pFooterImpl != null,
-                                       "Not yet constructed. Construct() should be called before use.");
-
-       return pFooterImpl->RemoveMenuButton();
-}
-
-result
-Footer::SetMenuButtonEnabled(bool enable)
-{
-       _FooterImpl* pFooterImpl = _FooterImpl::GetInstance(*this);
-
-       SysAssertf(pFooterImpl != null,
-                                       "Not yet constructed. Construct() should be called before use.");
-
-       return pFooterImpl->SetMenuButtonEnabled(enable);
-}
-
-result
-Footer::SetMenuButton(void)
-{
-       _FooterImpl* pFooterImpl = _FooterImpl::GetInstance(*this);
-
-       SysAssertf(pFooterImpl != null,
-                                       "Not yet constructed. Construct() should be called before use.");
-
-       return pFooterImpl->SetMenuButton();
-}
-
  }}} // Tizen::Ui::Controls
diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp

index 8af3d0b..54ccddb 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -1134,22 +1134,6 @@ _EditPresenter::Dispose(void)
                         {
                                 __pParentForm->SetKeypadShowState(false);
                         }
-
-                       if (__pParentForm->GetFooter())
-                       {
-                               if (__pParentForm->GetFooter()->GetButton(BACK_BUTTON))
-                               {
-                                       __pParentForm->GetFooter()->Invalidate(true);
-                               }
-                       }
-
-                       if (__pParentForm->GetHeader())
-                       {
-                               if (__pParentForm->GetHeader()->GetButton(BACK_BUTTON))
-                               {
-                                       __pParentForm->GetHeader()->Invalidate(true);
-                               }
-                       }
                 }
  
                 AdjustParentPanelHeight(true);
@@ -1162,24 +1146,6 @@ _EditPresenter::Dispose(void)
         __initialFooterVisibleStatus = EDIT_FOOTER_VISIBLE_STATUS_NONE;
         __footerVisibleChanged = false;
  
-       if (__pParentForm)
-       {
-               if (__pParentForm->GetFooter())
-               {
-                       if (__pParentForm->GetFooter()->GetButton(BACK_BUTTON))
-                       {
-                               __pParentForm->GetFooter()->Invalidate(true);
-                       }
-               }
-
-               if (__pParentForm->GetHeader())
-               {
-                       if (__pParentForm->GetHeader()->GetButton(BACK_BUTTON))
-                       {
-                               __pParentForm->GetHeader()->Invalidate(true);
-                       }
-               }
-       }
  
         if (__pClipboard)
         {
diff --git a/src/ui/controls/FUiCtrl_FooterImpl.cpp b/src/ui/controls/FUiCtrl_FooterImpl.cpp

index 57261e3..3eda1bb 100644 (file)
--- a/src/ui/controls/FUiCtrl_FooterImpl.cpp
+++ b/src/ui/controls/FUiCtrl_FooterImpl.cpp
@@ -208,14 +208,8 @@ _FooterImpl::GetButtonStatus(ButtonPosition position) const
  ButtonItemStatus
  _FooterImpl::GetBackButtonStatus(void) const
  {
-       SysTryReturn(NID_UI_CTRL, (IsBackButtonSet() == true), BUTTON_ITEM_STATUS_NORMAL, E_INVALID_OPERATION,
-                       "[E_INVALID_OPERATION] A Back button doesn't exist");
-
-       _ButtonStatus buttonStatus;
-
-       buttonStatus = GetCore().GetButtonStatus(BACK_BUTTON);
-
-       return ConvertButtonItemStatus(buttonStatus);
+       SysTryReturn(NID_UI_CTRL, 0, BUTTON_ITEM_STATUS_NORMAL, E_INVALID_OPERATION,
+                               "[E_INVALID_OPERATION] No button item is set at the specified position.");
  }
  
  Color
@@ -324,7 +318,7 @@ _FooterImpl::IsButtonSet(ButtonPosition position) const
  bool
  _FooterImpl::IsBackButtonSet(void) const
  {
-       return GetCore().IsButtonSet(BACK_BUTTON);
+       return false;
  }
  
  bool
@@ -357,7 +351,7 @@ _FooterImpl::RemoveButtonAt(ButtonPosition position)
  result
  _FooterImpl::RemoveBackButton(void)
  {
-       return GetCore().RemoveButtonAt(BACK_BUTTON);
+       return E_SUCCESS;
  }
  
  result
@@ -397,18 +391,6 @@ _FooterImpl::SetButton(ButtonPosition position, const ButtonItem& button)
         if (__style == FOOTER_STYLE_SEGMENTED_TEXT || __style == FOOTER_STYLE_SEGMENTED_ICON || __style == FOOTER_STYLE_SEGMENTED_ICON_TEXT
                         || __style == FOOTER_STYLE_BUTTON_TEXT || __style == FOOTER_STYLE_BUTTON_ICON || __style == FOOTER_STYLE_BUTTON_ICON_TEXT)
         {
-               if (position == BUTTON_POSITION_RIGHT)
-               {
-                       SysTryReturnResult(NID_UI_CTRL, (IsBackButtonSet() == false), E_SYSTEM,
-                                       "[E_SYSTEM] A Back button exists.");
-               }
-
-               if (position == BUTTON_POSITION_LEFT)
-               {
-                       SysTryReturnResult(NID_UI_CTRL, (IsMenuButtonSet() == false), E_SYSTEM,
-                                       "[E_SYSTEM] A Menu button exists.");
-               }
-
                 SysTryReturnResult(NID_UI_CTRL, (count <= FOOTER_MAX_ITEM_COUNT_WITH_BUTTON), E_SYSTEM,
                                 "[E_SYSTEM] If the item count is larger then 3, no button can be set.");
         }
@@ -449,226 +431,7 @@ _FooterImpl::SetButtonTextColor(ButtonItemStatus status, const Color& color)
  result
  _FooterImpl::SetBackButton(void)
  {
-       bool isBackButton = false;
-
-       Tizen::System::SystemInfo::GetValue(L"http://tizen.org/feature/input.keys.back", isBackButton);
-
-       if(isBackButton)
-       {
-               SysTryReturnResult(NID_UI_CTRL, 0, E_UNSUPPORTED_OPERATION, "[E_UNSUPPORTED_OPERATION] HW BackButton exist");
-       }
-
-       SysTryReturnResult(NID_UI_CTRL, !(__style == FOOTER_STYLE_TAB || __style == FOOTER_STYLE_TAB_LARGE), E_UNSUPPORTED_OPERATION,
-                          "[E_UNSUPPORTED_OPERATION] The current Footer style does not support the operation.");
-
-       if ((__style == FOOTER_STYLE_SEGMENTED_TEXT || __style == FOOTER_STYLE_SEGMENTED_ICON || __style == FOOTER_STYLE_SEGMENTED_ICON_TEXT) && GetItemCount() > 4)
-       {
-               SysLogException(NID_UI_CTRL, E_SYSTEM, "[E_SYSTEM] Unable to set the back button.");
-               return E_SYSTEM;
-       }
-       else if ((__style == FOOTER_STYLE_BUTTON_ICON || __style == FOOTER_STYLE_BUTTON_TEXT || __style == FOOTER_STYLE_BUTTON_ICON_TEXT) && GetItemCount() > 5)
-       {
-               SysLogException(NID_UI_CTRL, E_SYSTEM, "[E_SYSTEM] Unable to set the back button.");
-               return E_SYSTEM;
-       }
-
-       _Button* pButton = _Button::CreateButtonN();
-
-       float buttonHeight = 0.0f;
-       float buttonWidth = 0.0f;
-       float iconSize = 0.0f;
-
-       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_HEIGHT, GetCore().GetOrientation(), buttonHeight);
-       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_WIDTH, GetCore().GetOrientation(), buttonWidth);
-       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize);
-
-       pButton->SetBounds(FloatRectangle(0.0f, 0.0f, buttonWidth, buttonHeight));
-
-       Bitmap* pBackgroundNormalBitmap = null;
-       Bitmap* pBackgroundDisabledBitmap = null;
-       Bitmap* pBackgroundPressedBitmap = null;
-       Bitmap* pBackgroundHighlightedBitmap = null;
-
-       Bitmap* pColorReplacedBitmap = null;
-
-       Bitmap* pBackIconNormalBitmap = null;
-       Bitmap* pBackIconDisabledBitmap = null;
-       Bitmap* pBackIconPressedBitmap = null;
-       Bitmap* pBackIconHighlightedBitmap = null;
-
-       Bitmap* pBackIconNormalEffectBitmap = null;
-       Bitmap* pBackIconDisabledEffectBitmap = null;
-       Bitmap* pBackIconPressedEffectBitmap = null;
-       Bitmap* pBackIconHighlightedEffectBitmap = null;
-
-       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBackgroundNormalBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackgroundDisabledBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackgroundPressedBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackgroundHighlightedBitmap);
-
-       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconNormalBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconDisabledBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconPressedBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconHighlightedBitmap);
-
-       bool customTheme = false;
-
-       customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_NORMAL);
-       if (customTheme == false)
-       {
-               GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconNormalEffectBitmap);
-       }
-
-       customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_DISABLED);
-       if (customTheme == false)
-       {
-               GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconDisabledEffectBitmap);
-       }
-
-       customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_PRESSED);
-       if (customTheme == false)
-       {
-               GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconPressedEffectBitmap);
-       }
-
-       customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_HIGHLIGHTED);
-       if (customTheme == false)
-       {
-               GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconHighlightedEffectBitmap);
-       }
-
-       if (pBackgroundNormalBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               GetCore().GetButtonColor(_BUTTON_STATUS_NORMAL));
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_NORMAL, *pColorReplacedBitmap);
-               delete pColorReplacedBitmap;
-
-               delete pBackgroundNormalBitmap;
-       }
-
-       if (pBackgroundDisabledBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               GetCore().GetButtonColor(_BUTTON_STATUS_DISABLED));
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_DISABLED, *pColorReplacedBitmap);
-               delete pColorReplacedBitmap;
-
-               delete pBackgroundDisabledBitmap;
-       }
-
-       if (pBackgroundPressedBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               GetCore().GetButtonColor(_BUTTON_STATUS_PRESSED));
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_PRESSED, *pColorReplacedBitmap);
-               delete pColorReplacedBitmap;
-
-               delete pBackgroundPressedBitmap;
-       }
-
-       if (pBackgroundHighlightedBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               GetCore().GetButtonColor(_BUTTON_STATUS_HIGHLIGHTED));
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_HIGHLIGHTED, *pColorReplacedBitmap);
-               delete pColorReplacedBitmap;
-
-               delete pBackgroundHighlightedBitmap;
-       }
-
-       Color normalColor;
-       Color disabledColor;
-       Color pressedColor;
-       Color highlightedColor;
-
-       GET_COLOR_CONFIG(FOOTER::BACK_ICON_NORMAL, normalColor);
-       GET_COLOR_CONFIG(FOOTER::BACK_ICON_DISABLED, disabledColor);
-       GET_COLOR_CONFIG(FOOTER::BACK_ICON_PRESSED, pressedColor);
-       GET_COLOR_CONFIG(FOOTER::BACK_ICON_HIGHLIGHTED, highlightedColor);
-
-       if (pBackIconNormalBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackIconNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), normalColor);
-
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-                       pButton->SetBitmap(_BUTTON_STATUS_NORMAL, FloatPoint(0.0f, 0.0f), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pBackIconNormalBitmap;
-       }
-
-       if (pBackIconDisabledBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackIconDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA), disabledColor);
-
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-                       pButton->SetBitmap(_BUTTON_STATUS_DISABLED, FloatPoint(0.0f, 0.0f), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pBackIconDisabledBitmap;
-       }
-
-       if (pBackIconPressedBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackIconPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), pressedColor);
-
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-                       pButton->SetBitmap(_BUTTON_STATUS_PRESSED, FloatPoint(0.0f, 0.0f), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pBackIconPressedBitmap;
-       }
-
-       if (pBackIconHighlightedBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackIconHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), highlightedColor);
-
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-                       pButton->SetBitmap(_BUTTON_STATUS_HIGHLIGHTED, FloatPoint(0.0f, 0.0f), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pBackIconHighlightedBitmap;
-       }
-
-       if (pBackIconNormalEffectBitmap)
-       {
-               pButton->SetEffectBitmap(_BUTTON_STATUS_NORMAL, FloatPoint(0.0f, 0.0f), *pBackIconNormalEffectBitmap);
-               delete pBackIconNormalEffectBitmap;
-       }
-       if (pBackIconDisabledEffectBitmap)
-       {
-               pButton->SetEffectBitmap(_BUTTON_STATUS_DISABLED, FloatPoint(0.0f, 0.0f), *pBackIconDisabledEffectBitmap);
-               delete pBackIconDisabledEffectBitmap;
-       }
-       if (pBackIconPressedEffectBitmap)
-       {
-               pButton->SetEffectBitmap(_BUTTON_STATUS_PRESSED, FloatPoint(0.0f, 0.0f), *pBackIconPressedEffectBitmap);
-               delete pBackIconPressedEffectBitmap;
-       }
-       if (pBackIconHighlightedEffectBitmap)
-       {
-               pButton->SetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED, FloatPoint(0.0f, 0.0f), *pBackIconHighlightedEffectBitmap);
-               delete pBackIconHighlightedEffectBitmap;
-       }
-
-       return GetCore().SetButton(BACK_BUTTON, pButton);
+       return E_UNSUPPORTED_OPERATION;
  }
  
  result
@@ -772,7 +535,7 @@ _FooterImpl::SetButtonEnabled(ButtonPosition position, bool enable)
  result
  _FooterImpl::SetBackButtonEnabled(bool enable)
  {
-       return GetCore().SetButtonEnabled(BACK_BUTTON, enable);
+       return E_INVALID_OPERATION;
  }
  
  result
@@ -955,59 +718,43 @@ _FooterImpl::CheckItemValidate(const FooterItem& item)
  
         if (__style == FOOTER_STYLE_BUTTON_TEXT || __style == FOOTER_STYLE_BUTTON_ICON || __style == FOOTER_STYLE_BUTTON_ICON_TEXT)
         {
-               if (IsButtonSet(BUTTON_POSITION_LEFT) || IsMenuButtonSet())
+               if (IsButtonSet(BUTTON_POSITION_LEFT))
                 {
                         SysTryReturnResult(NID_UI_CTRL, (count < 3), E_MAX_EXCEEDED,
                                         "[E_MAX_EXCEEDED] The number of items have exceeded the maximum limit.");
                 }
                 else
                 {
-                       if (IsBackButtonSet())
+                       if (IsButtonSet(BUTTON_POSITION_RIGHT))
                         {
-                               SysTryReturnResult(NID_UI_CTRL, (count < 5), E_MAX_EXCEEDED,
+                               SysTryReturnResult(NID_UI_CTRL, (count < 3), E_MAX_EXCEEDED,
                                                 "[E_MAX_EXCEEDED] The number of items have exceeded the maximum limit.");
                         }
                         else
                         {
-                               if (IsButtonSet(BUTTON_POSITION_RIGHT))
-                               {
-                                       SysTryReturnResult(NID_UI_CTRL, (count < 3), E_MAX_EXCEEDED,
-                                                       "[E_MAX_EXCEEDED] The number of items have exceeded the maximum limit.");
-                               }
-                               else
-                               {
-                                       SysTryReturnResult(NID_UI_CTRL, (count < 5), E_MAX_EXCEEDED,
-                                                       "[E_MAX_EXCEEDED] The number of items have exceeded the maximum limit.");
-                               }
+                               SysTryReturnResult(NID_UI_CTRL, (count < 5), E_MAX_EXCEEDED,
+                                               "[E_MAX_EXCEEDED] The number of items have exceeded the maximum limit.");
                         }
                 }
         }
         else if (__style == FOOTER_STYLE_SEGMENTED_TEXT || __style == FOOTER_STYLE_SEGMENTED_ICON || __style == FOOTER_STYLE_SEGMENTED_ICON_TEXT)
         {
-               if (IsButtonSet(BUTTON_POSITION_LEFT) || IsMenuButtonSet())
+               if (IsButtonSet(BUTTON_POSITION_LEFT))
                 {
                         SysTryReturnResult(NID_UI_CTRL, (count < 3), E_MAX_EXCEEDED,
                                         "[E_MAX_EXCEEDED] The number of items have exceeded the maximum limit.");
                 }
                 else
                 {
-                       if (IsBackButtonSet())
+                       if (IsButtonSet(BUTTON_POSITION_RIGHT))
                         {
-                               SysTryReturnResult(NID_UI_CTRL, (count < 4), E_MAX_EXCEEDED,
+                               SysTryReturnResult(NID_UI_CTRL, (count < 3), E_MAX_EXCEEDED,
                                                 "[E_MAX_EXCEEDED] The number of items have exceeded the maximum limit.");
                         }
                         else
                         {
-                               if (IsButtonSet(BUTTON_POSITION_RIGHT))
-                               {
-                                       SysTryReturnResult(NID_UI_CTRL, (count < 3), E_MAX_EXCEEDED,
-                                                       "[E_MAX_EXCEEDED] The number of items have exceeded the maximum limit.");
-                               }
-                               else
-                               {
-                                       SysTryReturnResult(NID_UI_CTRL, (count < 4), E_MAX_EXCEEDED,
-                                                       "[E_MAX_EXCEEDED] The number of items have exceeded the maximum limit.");
-                               }
+                               SysTryReturnResult(NID_UI_CTRL, (count < 4), E_MAX_EXCEEDED,
+                                               "[E_MAX_EXCEEDED] The number of items have exceeded the maximum limit.");
                         }
                 }
         }
@@ -1624,256 +1371,6 @@ _FooterImpl::ConvertFooterStyle(FooterStyle style)
         return viewStyle;
  }
  
-bool
-_FooterImpl::IsMenuButtonSet(void) const
-{
-       return GetCore().IsButtonSet(MENU_BUTTON);
-}
-
-ButtonItemStatus
-_FooterImpl::GetMenuButtonStatus(void) const
-{
-       SysTryReturn(NID_UI_CTRL, (IsMenuButtonSet() == true), BUTTON_ITEM_STATUS_NORMAL, E_INVALID_OPERATION,
-                       "[E_INVALID_OPERATION] A Menu button doesn't exist");
-
-       _ButtonStatus buttonStatus;
-
-       buttonStatus = GetCore().GetButtonStatus(MENU_BUTTON);
-
-       return ConvertButtonItemStatus(buttonStatus);
-}
-
-result
-_FooterImpl::RemoveMenuButton(void)
-{
-       return GetCore().RemoveButtonAt(MENU_BUTTON);
-}
-
-result
-_FooterImpl::SetMenuButtonEnabled(bool enable)
-{
-       return GetCore().SetButtonEnabled(MENU_BUTTON, enable);
-}
-
-result
-_FooterImpl::SetMenuButton(void)
-{
-       bool isMenuButton = false;
-
-       Tizen::System::SystemInfo::GetValue(L"http://tizen.org/feature/input.keys.menu", isMenuButton);
-
-       if(isMenuButton)
-       {
-               SysTryReturnResult(NID_UI_CTRL, 0, E_UNSUPPORTED_OPERATION, "[E_UNSUPPORTED_OPERATION] HW MenuButton exist");
-       }
-
-       SysTryReturnResult(NID_UI_CTRL, !(__style == FOOTER_STYLE_TAB || __style == FOOTER_STYLE_TAB_LARGE), E_UNSUPPORTED_OPERATION,
-                          "[E_UNSUPPORTED_OPERATION] The current Footer style does not support the operation.");
-
-       if (GetItemCount() > 3)
-       {
-               SysLogException(NID_UI_CTRL, E_SYSTEM, "[E_SYSTEM] Unable to set the menu button.");
-               return E_SYSTEM;
-       }
-
-       _Button* pButton = _Button::CreateButtonN();
-
-       float buttonHeight = 0.0f;
-       float buttonWidth = 0.0f;
-       float iconSize = 0.0f;
-
-       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_HEIGHT, GetCore().GetOrientation(), buttonHeight);
-       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_WIDTH, GetCore().GetOrientation(), buttonWidth);
-       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize);
-
-       pButton->SetBounds(FloatRectangle(0.0f, 0.0f, buttonWidth, buttonHeight));
-
-       Bitmap* pBackgroundNormalBitmap = null;
-       Bitmap* pBackgroundDisabledBitmap = null;
-       Bitmap* pBackgroundPressedBitmap = null;
-       Bitmap* pBackgroundHighlightedBitmap = null;
-
-       Bitmap* pColorReplacedBitmap = null;
-
-       Bitmap* pBackIconNormalBitmap = null;
-       Bitmap* pBackIconDisabledBitmap = null;
-       Bitmap* pBackIconPressedBitmap = null;
-       Bitmap* pBackIconHighlightedBitmap = null;
-
-       Bitmap* pBackIconNormalEffectBitmap = null;
-       Bitmap* pBackIconDisabledEffectBitmap = null;
-       Bitmap* pBackIconPressedEffectBitmap = null;
-       Bitmap* pBackIconHighlightedEffectBitmap = null;
-
-       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBackgroundNormalBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackgroundDisabledBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackgroundPressedBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackgroundHighlightedBitmap);
-
-       GET_BITMAP_CONFIG_N(FOOTER::MORE_ICON_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconNormalBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::MORE_ICON_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconDisabledBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::MORE_ICON_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconPressedBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::MORE_ICON_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconHighlightedBitmap);
-
-       bool customTheme = false;
-
-       customTheme = IS_CUSTOM_BITMAP(FOOTER::MORE_ICON_NORMAL);
-       if (customTheme == false)
-       {
-               GET_BITMAP_CONFIG_N(FOOTER::MORE_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconNormalEffectBitmap);
-       }
-
-       customTheme = IS_CUSTOM_BITMAP(FOOTER::MORE_ICON_DISABLED);
-       if (customTheme == false)
-       {
-               GET_BITMAP_CONFIG_N(FOOTER::MORE_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconDisabledEffectBitmap);
-       }
-
-       customTheme = IS_CUSTOM_BITMAP(FOOTER::MORE_ICON_PRESSED);
-       if (customTheme == false)
-       {
-               GET_BITMAP_CONFIG_N(FOOTER::MORE_ICON_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconPressedEffectBitmap);
-       }
-
-       customTheme = IS_CUSTOM_BITMAP(FOOTER::MORE_ICON_HIGHLIGHTED);
-       if (customTheme == false)
-       {
-               GET_BITMAP_CONFIG_N(FOOTER::MORE_ICON_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconHighlightedEffectBitmap);
-       }
-
-       if (pBackgroundNormalBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               GetCore().GetButtonColor(_BUTTON_STATUS_NORMAL));
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_NORMAL, *pColorReplacedBitmap);
-               delete pColorReplacedBitmap;
-
-               delete pBackgroundNormalBitmap;
-       }
-
-       if (pBackgroundDisabledBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               GetCore().GetButtonColor(_BUTTON_STATUS_DISABLED));
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_DISABLED, *pColorReplacedBitmap);
-               delete pColorReplacedBitmap;
-
-               delete pBackgroundDisabledBitmap;
-       }
-
-       if (pBackgroundPressedBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               GetCore().GetButtonColor(_BUTTON_STATUS_PRESSED));
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_PRESSED, *pColorReplacedBitmap);
-               delete pColorReplacedBitmap;
-
-               delete pBackgroundPressedBitmap;
-       }
-
-       if (pBackgroundHighlightedBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               GetCore().GetButtonColor(_BUTTON_STATUS_HIGHLIGHTED));
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_HIGHLIGHTED, *pColorReplacedBitmap);
-               delete pColorReplacedBitmap;
-
-               delete pBackgroundHighlightedBitmap;
-       }
-
-       Color normalColor;
-       Color disabledColor;
-       Color pressedColor;
-       Color highlightedColor;
-
-       GET_COLOR_CONFIG(FOOTER::MORE_ICON_NORMAL, normalColor);
-       GET_COLOR_CONFIG(FOOTER::MORE_ICON_DISABLED, disabledColor);
-       GET_COLOR_CONFIG(FOOTER::MORE_ICON_PRESSED, pressedColor);
-       GET_COLOR_CONFIG(FOOTER::MORE_ICON_HIGHLIGHTED, highlightedColor);
-
-       if (pBackIconNormalBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackIconNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), normalColor);
-
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-                       pButton->SetBitmap(_BUTTON_STATUS_NORMAL, FloatPoint(0.0f, 0.0f), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pBackIconNormalBitmap;
-       }
-
-       if (pBackIconDisabledBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackIconDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA), disabledColor);
-
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-                       pButton->SetBitmap(_BUTTON_STATUS_DISABLED, FloatPoint(0.0f, 0.0f), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pBackIconDisabledBitmap;
-       }
-
-       if (pBackIconPressedBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackIconPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), pressedColor);
-
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-                       pButton->SetBitmap(_BUTTON_STATUS_PRESSED, FloatPoint(0.0f, 0.0f), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pBackIconPressedBitmap;
-       }
-
-       if (pBackIconHighlightedBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackIconHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), highlightedColor);
-
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-                       pButton->SetBitmap(_BUTTON_STATUS_HIGHLIGHTED, FloatPoint(0.0f, 0.0f), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pBackIconHighlightedBitmap;
-       }
-
-       if (pBackIconNormalEffectBitmap)
-       {
-               pButton->SetEffectBitmap(_BUTTON_STATUS_NORMAL, FloatPoint(0.0f, 0.0f), *pBackIconNormalEffectBitmap);
-               delete pBackIconNormalEffectBitmap;
-       }
-       if (pBackIconDisabledEffectBitmap)
-       {
-               pButton->SetEffectBitmap(_BUTTON_STATUS_DISABLED, FloatPoint(0.0f, 0.0f), *pBackIconDisabledEffectBitmap);
-               delete pBackIconDisabledEffectBitmap;
-       }
-       if (pBackIconPressedEffectBitmap)
-       {
-               pButton->SetEffectBitmap(_BUTTON_STATUS_PRESSED, FloatPoint(0.0f, 0.0f), *pBackIconPressedEffectBitmap);
-               delete pBackIconPressedEffectBitmap;
-       }
-       if (pBackIconHighlightedEffectBitmap)
-       {
-               pButton->SetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED, FloatPoint(0.0f, 0.0f), *pBackIconHighlightedEffectBitmap);
-               delete pBackIconHighlightedEffectBitmap;
-       }
-
-       return GetCore().SetButton(MENU_BUTTON, pButton);
-}
  
  class _FooterMaker
         : public _UiBuilderControlMaker
@@ -2124,22 +1621,6 @@ protected:
                         pFooter->SetItemTextColor(FOOTER_ITEM_STATUS_DISABLED, color);
                 }
  
-               if (!(FOOTER_STYLE_TAB == fstyle || FOOTER_STYLE_TAB_LARGE == fstyle) && (pControl->GetElement(L"showBackButton", elementString)))
-               {
-                       if (elementString.Equals(L"true", false))
-                       {
-                               pFooter->SetBackButton();
-                       }
-               }
-
-               if (!(FOOTER_STYLE_TAB == fstyle || FOOTER_STYLE_TAB_LARGE == fstyle) && (pControl->GetElement(L"showMenuButton", elementString)))
-               {
-                       if (elementString.Equals(L"true", false))
-                       {
-                               pFooter->SetMenuButton();
-                       }
-               }
-
                 int itemCnt = pControl->GetItemCount();
                 ButtonItemStyle buttonItemStyle = BUTTON_ITEM_STYLE_TEXT;
                 ButtonPosition buttonPosition = BUTTON_POSITION_LEFT;
diff --git a/src/ui/controls/FUiCtrl_Form.cpp b/src/ui/controls/FUiCtrl_Form.cpp

index 4f08a8b..f712bf4 100644 (file)
--- a/src/ui/controls/FUiCtrl_Form.cpp
+++ b/src/ui/controls/FUiCtrl_Form.cpp
@@ -2441,16 +2441,6 @@ _Form::OnMouseReleased(const _Control& source, const _MouseInfo& mouseinfo)
                 return null;
         }
  
-       if (pToolbar->IsButtonSet(BACK_BUTTON))
-       {
-               void* pData = GetUserData();
-               if (pData)
-               {
-                       _FormImpl* pDataImpl = static_cast<_FormImpl*>(pData);
-                       pDataImpl->OnFormBackRequested(*this);
-               }
-       }
-
         return true;
  }
  
@@ -2981,29 +2971,6 @@ _Form::SetKeypadShowState(bool state)
         {
                 return;
         }
-
-       if (state)
-       {
-               if (__pHeader)
-               {
-                       __pHeader->SetHideButton(true);
-               }
-               if (__pFooter)
-               {
-                       __pFooter->SetHideButton(true);
-               }
-       }
-       else
-       {
-               if (__pHeader)
-               {
-                       __pHeader->SetHideButton(false);
-               }
-               if (__pFooter)
-               {
-                       __pFooter->SetHideButton(false);
-               }
-       }
  }
  
  void
@@ -3015,29 +2982,6 @@ _Form::SetClipboardShowState(bool state)
         {
                 return;
         }
-
-       if (state)
-       {
-               if (__pHeader)
-               {
-                       __pHeader->SetHideButton(true);
-               }
-               if (__pFooter)
-               {
-                       __pFooter->SetHideButton(true);
-               }
-       }
-       else
-       {
-               if (__pHeader)
-               {
-                       __pHeader->SetHideButton(false);
-               }
-               if (__pFooter)
-               {
-                       __pFooter->SetHideButton(false);
-               }
-       }
  }
  
  result
diff --git a/src/ui/controls/FUiCtrl_HeaderImpl.cpp b/src/ui/controls/FUiCtrl_HeaderImpl.cpp

index 85d9792..3dbce3e 100644 (file)
--- a/src/ui/controls/FUiCtrl_HeaderImpl.cpp
+++ b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
@@ -840,239 +840,32 @@ _HeaderImpl::SetTabEditModeEnabled(bool enable)
  result
  _HeaderImpl::SetBackButton(void)
  {
-       SysTryReturnResult(NID_UI_CTRL, (__style == HEADER_STYLE_BUTTON), E_UNSUPPORTED_OPERATION,
-                          "[E_UNSUPPORTED_OPERATION] The current Header style does not support the operation.");
-
-       _Button* pButton = _Button::CreateButtonN();
-
-       float buttonHeight = 0.0f;
-       float buttonWidth = 0.0f;
-       float iconSize = 0.0f;
-
-       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_HEIGHT, GetCore().GetOrientation(), buttonHeight);
-       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_WIDTH, GetCore().GetOrientation(), buttonWidth);
-       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize);
-
-       pButton->SetBounds(FloatRectangle(0.0f, 0.0f, buttonWidth, buttonHeight));
-
-       Bitmap* pBackgroundNormalBitmap = null;
-       Bitmap* pBackgroundDisabledBitmap = null;
-       Bitmap* pBackgroundPressedBitmap = null;
-       Bitmap* pBackgroundHighlightedBitmap = null;
-
-       Bitmap* pColorReplacedBitmap = null;
-
-       Bitmap* pBackIconNormalBitmap = null;
-       Bitmap* pBackIconDisabledBitmap = null;
-       Bitmap* pBackIconPressedBitmap = null;
-       Bitmap* pBackIconHighlightedBitmap = null;
-
-       Bitmap* pBackIconNormalEffectBitmap = null;
-       Bitmap* pBackIconDisabledEffectBitmap = null;
-       Bitmap* pBackIconPressedEffectBitmap = null;
-       Bitmap* pBackIconHighlightedEffectBitmap = null;
-
-       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBackgroundNormalBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackgroundDisabledBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackgroundPressedBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackgroundHighlightedBitmap);
-
-       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconNormalBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconDisabledBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconPressedBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconHighlightedBitmap);
-
-       bool customTheme = false;
-
-       customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_NORMAL);
-       if (customTheme == false)
-       {
-               GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconNormalEffectBitmap);
-       }
-
-       customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_DISABLED);
-       if (customTheme == false)
-       {
-               GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconDisabledEffectBitmap);
-       }
-
-       customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_PRESSED);
-       if (customTheme == false)
-       {
-               GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconPressedEffectBitmap);
-       }
-
-       customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_HIGHLIGHTED);
-       if (customTheme == false)
-       {
-               GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconHighlightedEffectBitmap);
-       }
-
-       if (pBackgroundNormalBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               GetCore().GetButtonColor(_BUTTON_STATUS_NORMAL));
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_NORMAL, *pColorReplacedBitmap);
-
-               delete pColorReplacedBitmap;
-               delete pBackgroundNormalBitmap;
-       }
-
-       if (pBackgroundDisabledBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               GetCore().GetButtonColor(_BUTTON_STATUS_DISABLED));
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_DISABLED, *pColorReplacedBitmap);
-
-               delete pColorReplacedBitmap;
-               delete pBackgroundDisabledBitmap;
-       }
-
-       if (pBackgroundPressedBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               GetCore().GetButtonColor(_BUTTON_STATUS_PRESSED));
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_PRESSED, *pColorReplacedBitmap);
-
-               delete pColorReplacedBitmap;
-               delete pBackgroundPressedBitmap;
-       }
-
-       if (pBackgroundHighlightedBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               GetCore().GetButtonColor(_BUTTON_STATUS_HIGHLIGHTED));
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_HIGHLIGHTED, *pColorReplacedBitmap);
-
-               delete pColorReplacedBitmap;
-               delete pBackgroundHighlightedBitmap;
-       }
-
-       Color normalColor;
-       Color disabledColor;
-       Color pressedColor;
-       Color highlightedColor;
-
-       GET_COLOR_CONFIG(FOOTER::BACK_ICON_NORMAL, normalColor);
-       GET_COLOR_CONFIG(FOOTER::BACK_ICON_DISABLED, disabledColor);
-       GET_COLOR_CONFIG(FOOTER::BACK_ICON_PRESSED, pressedColor);
-       GET_COLOR_CONFIG(FOOTER::BACK_ICON_HIGHLIGHTED, highlightedColor);
-
-       if (pBackIconNormalBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackIconNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), normalColor);
-
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-                       pButton->SetBitmap(_BUTTON_STATUS_NORMAL, FloatPoint(0.0f, 0.0f), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pBackIconNormalBitmap;
-       }
-
-       if (pBackIconDisabledBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackIconDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA), disabledColor);
-
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-                       pButton->SetBitmap(_BUTTON_STATUS_DISABLED, FloatPoint(0.0f, 0.0f), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pBackIconDisabledBitmap;
-       }
-
-       if (pBackIconPressedBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackIconPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), pressedColor);
-
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-                       pButton->SetBitmap(_BUTTON_STATUS_PRESSED, FloatPoint(0.0f, 0.0f), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pBackIconPressedBitmap;
-       }
-
-       if (pBackIconHighlightedBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackIconHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), highlightedColor);
-
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-                       pButton->SetBitmap(_BUTTON_STATUS_HIGHLIGHTED, FloatPoint(0.0f, 0.0f), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pBackIconHighlightedBitmap;
-       }
-
-       if (pBackIconNormalEffectBitmap)
-       {
-               pButton->SetEffectBitmap(_BUTTON_STATUS_NORMAL, FloatPoint(0.0f, 0.0f), *pBackIconNormalEffectBitmap);
-               delete pBackIconNormalEffectBitmap;
-       }
-       if (pBackIconDisabledEffectBitmap)
-       {
-               pButton->SetEffectBitmap(_BUTTON_STATUS_DISABLED, FloatPoint(0.0f, 0.0f), *pBackIconDisabledEffectBitmap);
-               delete pBackIconDisabledEffectBitmap;
-       }
-       if (pBackIconPressedEffectBitmap)
-       {
-               pButton->SetEffectBitmap(_BUTTON_STATUS_PRESSED, FloatPoint(0.0f, 0.0f), *pBackIconPressedEffectBitmap);
-               delete pBackIconPressedEffectBitmap;
-       }
-       if (pBackIconHighlightedEffectBitmap)
-       {
-               pButton->SetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED, FloatPoint(0.0f, 0.0f), *pBackIconHighlightedEffectBitmap);
-               delete pBackIconHighlightedEffectBitmap;
-       }
-
-       return GetCore().SetButton(BACK_BUTTON, pButton);
+       return E_UNSUPPORTED_OPERATION;
  }
  
  bool
  _HeaderImpl::IsBackButtonSet(void) const
  {
-       return GetCore().IsButtonSet(BACK_BUTTON);
+       return false;
  }
  
  void
  _HeaderImpl::RemoveBackButton(void)
  {
-       GetCore().RemoveButtonAt(BACK_BUTTON);
-
         return;
  }
  
  result
  _HeaderImpl::SetBackButtonEnabled(bool enable)
  {
-       return GetCore().SetButtonEnabled(BACK_BUTTON, enable);
+       return E_INVALID_OPERATION;
  }
  
  ButtonItemStatus
  _HeaderImpl::GetBackButtonStatus(void) const
  {
-       SysTryReturn(NID_UI_CTRL, (IsBackButtonSet() == true), BUTTON_ITEM_STATUS_NORMAL, E_INVALID_OPERATION,
-                       "[E_INVALID_OPERATION] A Back button doesn't exist");
-
-       _ButtonStatus buttonStatus;
-
-       buttonStatus = GetCore().GetButtonStatus(BACK_BUTTON);
-
-       return ConvertButtonItemStatus(buttonStatus);
+       SysTryReturn(NID_UI_CTRL, 0, BUTTON_ITEM_STATUS_NORMAL, E_INVALID_OPERATION,
+                       "[E_INVALID_OPERATION] No button item is set at the specified position.");
  }
  
  Rectangle
@@ -1180,13 +973,6 @@ _HeaderImpl::RemoveActionEventListener(IActionEventListener& listener)
  void
  _HeaderImpl::OnActionPerformed(const _Control& source, int actionId)
  {
-       _Button* pButton = dynamic_cast<_Button*>(const_cast<_Control*>(&source));
-
-       if (pButton == GetCore().GetButton(BACK_BUTTON))
-       {
-               return ;
-       }
-
         if (GetCore().IsInitialDraw() == true && GetCore().GetSelectedItemIndex() == 0)
         {
                 return;
@@ -2170,14 +1956,6 @@ protected:
                         }
                 }
  
-               if ((HEADER_STYLE_BUTTON == hstyle) && (pControl->GetElement(L"showBackButton", elementString)))
-               {
-                       if (elementString.Equals(L"true", false))
-                       {
-                               pHeader->SetBackButton();
-                       }
-               }
-
                 int itemCnt = pControl->GetItemCount();
                 ButtonItemStyle buttonItemStyle = BUTTON_ITEM_STYLE_TEXT;
                 ButtonPosition buttonPosition = BUTTON_POSITION_LEFT;
diff --git a/src/ui/controls/FUiCtrl_Keypad.cpp b/src/ui/controls/FUiCtrl_Keypad.cpp

index 33a5479..8f24480 100755 (executable)
--- a/src/ui/controls/FUiCtrl_Keypad.cpp
+++ b/src/ui/controls/FUiCtrl_Keypad.cpp
@@ -374,7 +374,6 @@ _Keypad::CreateFooter(void)
                 if(!isHWBackButtonExist)
                 {
                         pFooter->SetBackEventListener(*this, FOOTER_BACK_BUTTON_ID);
-                       pFooter->SetButton(BACK_BUTTON, CreateFooterBackButton(pFooter));
                 }
  
                 r = AttachChild(*pFooter);
@@ -618,15 +617,6 @@ _Keypad::ChangeLayoutInternal(LayoutChangeState layoutChangeState)
                 {
                         editRect.height -= keypadRect.height;
                 }
-
-               if (!__isPredictionWindowOpendInUSBMode)
-               {
-                       __pFooter->SetHideButton(true);
-               }
-       }
-       else
-       {
-               __pFooter->SetHideButton(false);
         }
  
         r = __pChildEdit->SetBounds(editRect);
diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp

index e5db889..0d93e96 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -133,9 +133,7 @@ _Toolbar::_Toolbar(void)
  
         __pButtonItems[LEFT_BUTTON] = null;
         __pButtonItems[RIGHT_BUTTON] = null;
-       __pButtonItems[BACK_BUTTON] = null;
         __pButtonItems[MIDDLE_BUTTON] = null;
-       __pButtonItems[MENU_BUTTON] = null;
  
         for (int i = 0; i < TOOLBAR_ANIMATION_POSITION_MAX; i++)
         {
@@ -1592,48 +1590,15 @@ _Toolbar::SetButton(ToolbarButton position, _Button* pButton)
                                 pButton->SetPosition(FloatPoint(toolbarWidth - buttonWidth - horizontalMargin, verticalMargin));
                                 break;
  
-                       case BACK_BUTTON:
-                               if (IsButtonSet(RIGHT_BUTTON) == true)
-                               {
-                                       RemoveButtonAt(RIGHT_BUTTON);
-                               }
-
-                               pButton->SetPosition(FloatPoint(toolbarWidth - buttonWidth, 0.0f));
-                               if (__pBackEventListener)
-                               {
-                                       pButton->AddActionEventListener(*__pBackEventListener);
-                                       pButton->SetActionId(__backActionId);
-                               }
-                               break;
-
                         case MIDDLE_BUTTON:
                                 pButton->SetPosition(FloatPoint((toolbarWidth - buttonWidth - horizontalMargin)/2, verticalMargin));
                                 break;
  
-                       case MENU_BUTTON:
-                               if (IsButtonSet(LEFT_BUTTON) == true)
-                               {
-                                       RemoveButtonAt(LEFT_BUTTON);
-                               }
-
-                               pButton->SetPosition(FloatPoint(0.0f, 0.0f));
-                               if (__pMenuEventListener)
-                               {
-                                       pButton->AddActionEventListener(*__pMenuEventListener);
-                                       pButton->SetActionId(__menuActionId);
-                               }
-                               break;
-
                         default:
                                 break;
                 }
         }
  
-       if (!(position == BACK_BUTTON || position == MENU_BUTTON) && __pActionEventListener != null)
-       {
-               pButton->AddActionEventListener(*__pActionEventListener);
-       }
-
         if (__pButtonItems[position])
         {
                 if (position == LEFT_BUTTON)
@@ -2836,8 +2801,6 @@ _Toolbar::SetTransparent(bool transparent)
                                 ApplyUserGUI(TOOLBAR_BUTTON, __pButtonItems[i]);
                         }
                 }
-
-               SetTransBackButton(true);
         }
         else // not transparent
         {
@@ -2862,8 +2825,6 @@ _Toolbar::SetTransparent(bool transparent)
                                 ApplyUserGUI(TOOLBAR_BUTTON, __pButtonItems[i]);
                         }
                 }
-
-               SetTransBackButton(false);
         }
  
         delete pMagentaBackgroundBitmap;
@@ -2951,15 +2912,9 @@ _Toolbar::AddAccessibilityElement(ToolbarButton position, _Button* pButton)
                 case RIGHT_BUTTON:
                         name = L"RightButtonText";
                         break;
-               case BACK_BUTTON:
-                       name = L"BackButtonText";
-                       break;
                 case MIDDLE_BUTTON:
                         name = L"MiddleButtonText";
                         break;
-               case MENU_BUTTON:
-                       name = L"MenuButtonText";
-                       break;
                 default:
                         return;
                         break;
@@ -2980,20 +2935,7 @@ _Toolbar::AddAccessibilityElement(ToolbarButton position, _Button* pButton)
         {
                 pButtonElement->SetName(name);
  
-               if (position == BACK_BUTTON)
-               {
-                       pButtonElement->SetLabel("Back");
-                       pButtonElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
-               }
-               else if (position == MENU_BUTTON)
-               {
-                       pButtonElement->SetLabel("Menu");
-                       pButtonElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
-               }
-               else
-               {
-                       pButtonElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
-               }
+               pButtonElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
                 FloatRectangle floatRect = GetButtonBoundsF(position);
                 pButtonElement->SetBounds(FloatRectangle(0,floatRect.y, pButton->GetBoundsF().width, floatRect.height));
         }
@@ -3132,62 +3074,34 @@ _Toolbar::OnDrawFocus(void)
         {
                 if (__itemCount == 0)
                 {
-                       if (__pButtonItems[LEFT_BUTTON] || __pButtonItems[MENU_BUTTON])
+                       if (__pButtonItems[LEFT_BUTTON])
                         {
-                               if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                               if (__pButtonItems[RIGHT_BUTTON])
                                 {
                                         if (__highlightedItemIndex == __itemCount)
                                         {
-                                               if (__pButtonItems[MENU_BUTTON])
-                                               {
-                                                       __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                               }
-                                               else if (__pButtonItems[LEFT_BUTTON])
-                                               {
-                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                               }
+                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                         }
                                         else if (__highlightedItemIndex == __itemCount + 1)
                                         {
-                                               if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                               }
-                                               else if (__pButtonItems[RIGHT_BUTTON])
-                                               {
-                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                               }
+                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                         }
                                 }
                                 else
                                 {
                                         if (__highlightedItemIndex == __itemCount)
                                         {
-                                               if      (__pButtonItems[MENU_BUTTON])
-                                               {
-                                                       __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                               }
-                                               else if (__pButtonItems[LEFT_BUTTON])
-                                               {
-                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                               }
+                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                         }
                                 }
                         }
                         else
                         {
-                               if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                               if (__pButtonItems[RIGHT_BUTTON])
                                 {
                                         if (__highlightedItemIndex == __itemCount)
                                         {
-                                               if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                               }
-                                               else if (__pButtonItems[RIGHT_BUTTON])
-                                               {
-                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                               }
+                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                         }
                                 }
                         }
@@ -3203,62 +3117,34 @@ _Toolbar::OnDrawFocus(void)
                         }
                         else
                         {
-                               if (__pButtonItems[LEFT_BUTTON] || __pButtonItems[MENU_BUTTON])
+                               if (__pButtonItems[LEFT_BUTTON])
                                 {
-                                       if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                                       if (__pButtonItems[RIGHT_BUTTON])
                                         {
                                                 if (__highlightedItemIndex == __itemCount)
                                                 {
-                                                       if (__pButtonItems[MENU_BUTTON])
-                                                       {
-                                                               __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
-                                                       else if (__pButtonItems[LEFT_BUTTON])
-                                                       {
-                                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
+                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                                 }
                                                 else if (__highlightedItemIndex == __itemCount + 1)
                                                 {
-                                                       if (__pButtonItems[BACK_BUTTON])
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
-                                                       else if (__pButtonItems[RIGHT_BUTTON])
-                                                       {
-                                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
+                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                                 }
                                         }
                                         else
                                         {
                                                 if (__highlightedItemIndex == __itemCount)
                                                 {
-                                                       if (__pButtonItems[MENU_BUTTON])
-                                                       {
-                                                               __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
-                                                       else if (__pButtonItems[LEFT_BUTTON])
-                                                       {
-                                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
+                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                                 }
                                         }
                                 }
                                 else
                                 {
-                                       if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                                       if (__pButtonItems[RIGHT_BUTTON])
                                         {
                                                 if (__highlightedItemIndex == __itemCount)
                                                 {
-                                                       if (__pButtonItems[BACK_BUTTON])
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
-                                                       else if (__pButtonItems[RIGHT_BUTTON])
-                                                       {
-                                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
+                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                                 }
                                         }
                                 }
@@ -3300,62 +3186,34 @@ _Toolbar::OnFocusModeStateChanged(void)
  {
         if (__itemCount == 0)
         {
-               if (__pButtonItems[LEFT_BUTTON] || __pButtonItems[MENU_BUTTON])
+               if (__pButtonItems[LEFT_BUTTON])
                 {
-                       if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                       if (__pButtonItems[RIGHT_BUTTON])
                         {
                                 if (__highlightedItemIndex == __itemCount)
                                 {
-                                       if (__pButtonItems[MENU_BUTTON])
-                                       {
-                                               __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                       }
-                                       else if (__pButtonItems[LEFT_BUTTON])
-                                       {
-                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                       }
+                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                 }
                                 else if (__highlightedItemIndex == __itemCount + 1)
                                 {
-                                       if (__pButtonItems[BACK_BUTTON])
-                                       {
-                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                       }
-                                       else if (__pButtonItems[RIGHT_BUTTON])
-                                       {
-                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                       }
+                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                 }
                         }
                         else
                         {
                                 if (__highlightedItemIndex == __itemCount)
                                 {
-                                       if      (__pButtonItems[MENU_BUTTON])
-                                       {
-                                               __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                       }
-                                       else if (__pButtonItems[LEFT_BUTTON])
-                                       {
-                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                       }
+                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                 }
                         }
                 }
                 else
                 {
-                       if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                       if (__pButtonItems[RIGHT_BUTTON])
                         {
                                 if (__highlightedItemIndex == __itemCount)
                                 {
-                                       if (__pButtonItems[BACK_BUTTON])
-                                       {
-                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                       }
-                                       else if (__pButtonItems[RIGHT_BUTTON])
-                                       {
-                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                       }
+                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                 }
                         }
                 }
@@ -3371,62 +3229,34 @@ _Toolbar::OnFocusModeStateChanged(void)
                 }
                 else
                 {
-                       if (__pButtonItems[LEFT_BUTTON] || __pButtonItems[MENU_BUTTON])
+                       if (__pButtonItems[LEFT_BUTTON])
                         {
-                               if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                               if (__pButtonItems[RIGHT_BUTTON])
                                 {
                                         if (__highlightedItemIndex == __itemCount)
                                         {
-                                               if (__pButtonItems[MENU_BUTTON])
-                                               {
-                                                       __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                               }
-                                               else if (__pButtonItems[LEFT_BUTTON])
-                                               {
-                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                               }
+                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                         }
                                         else if (__highlightedItemIndex == __itemCount + 1)
                                         {
-                                               if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                               }
-                                               else if (__pButtonItems[RIGHT_BUTTON])
-                                               {
-                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                               }
+                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                         }
                                 }
                                 else
                                 {
                                         if (__highlightedItemIndex == __itemCount)
                                         {
-                                               if (__pButtonItems[MENU_BUTTON])
-                                               {
-                                                       __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                               }
-                                               else if (__pButtonItems[LEFT_BUTTON])
-                                               {
-                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                               }
+                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                         }
                                 }
                         }
                         else
                         {
-                               if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                               if (__pButtonItems[RIGHT_BUTTON])
                                 {
                                         if (__highlightedItemIndex == __itemCount)
                                         {
-                                               if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                               }
-                                               else if (__pButtonItems[RIGHT_BUTTON])
-                                               {
-                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                               }
+                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                         }
                                 }
                         }
@@ -3603,110 +3433,40 @@ _Toolbar::OnFooterFocusGained(const _Control& source)
  {
         if (__itemCount == 0)
         {
-               if (__pButtonItems[MENU_BUTTON] || __pButtonItems[LEFT_BUTTON])
+               if (__pButtonItems[LEFT_BUTTON])
                 {
-                       if (__pButtonItems[MENU_BUTTON])
+                       if(__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                         {
-                               if(__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                               {
-                                       __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                       __highlightedItemIndex = __itemCount;
-                                       __lastHighlightedItemIndex = __highlightedItemIndex;
-                                       __highlighted = true;
-                               }
-                               else
-                               {
-                                       if (__pButtonItems[BACK_BUTTON] || __pButtonItems[RIGHT_BUTTON])
-                                       {
-                                               if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       if(__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                                               __highlightedItemIndex = __itemCount + 1;
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                               __highlighted = true;
-                                                       }
-                                               }
-                                               else if (__pButtonItems[RIGHT_BUTTON])
-                                               {
-                                                       if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
  
-                                                               __highlightedItemIndex = __itemCount + 1;
-                                                               __lastHighlightedItemIndex =__highlightedItemIndex;
-                                                               __highlighted = true;
-                                                       }
-                                               }
-                                       }
-                               }
+                               __highlightedItemIndex = __itemCount;
+                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                               __highlighted = true;
                         }
-                       else if (__pButtonItems[LEFT_BUTTON])
+                       else
                         {
-                               if(__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                               {
-                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                       __highlightedItemIndex = __itemCount;
-                                       __lastHighlightedItemIndex = __highlightedItemIndex;
-                                       __highlighted = true;
-                               }
-                               else
+                               if (__pButtonItems[RIGHT_BUTTON])
                                 {
-                                       if (__pButtonItems[BACK_BUTTON] || __pButtonItems[RIGHT_BUTTON])
+                                       if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                         {
-                                               if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       if(__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                                               __highlightedItemIndex = __itemCount + 1;
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                               __highlighted = true;
-                                                       }
-                                               }
-                                               else if (__pButtonItems[RIGHT_BUTTON])
-                                               {
-                                                       if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
  
-                                                               __highlightedItemIndex = __itemCount + 1;
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                               __highlighted = true;
-                                                       }
-                                               }
+                                               __highlightedItemIndex = __itemCount + 1;
+                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                               __highlighted = true;
                                         }
                                 }
                         }
                 }
-               else if (__pButtonItems[BACK_BUTTON] || __pButtonItems[RIGHT_BUTTON])
+               else if (__pButtonItems[RIGHT_BUTTON])
                 {
-                       if (__pButtonItems[BACK_BUTTON])
-                       {
-                               if(__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                               {
-                                       __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                       __highlightedItemIndex = __itemCount;
-                                       __lastHighlightedItemIndex = __highlightedItemIndex;
-                                       __highlighted = true;
-                               }
-                       }
-                       else if (__pButtonItems[RIGHT_BUTTON])
+                       if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                         {
-                               if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                               {
-                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
  
-                                       __highlightedItemIndex = __itemCount;
-                                       __lastHighlightedItemIndex = __highlightedItemIndex;
-                                       __highlighted = true;
-                               }
+                               __highlightedItemIndex = __itemCount;
+                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                               __highlighted = true;
                         }
                 }
         }
@@ -3727,132 +3487,53 @@ _Toolbar::OnFooterFocusGained(const _Control& source)
                 }
                 else // not segmented
                 {
-                       if (__pButtonItems[MENU_BUTTON] || __pButtonItems[LEFT_BUTTON])
+                       if (__pButtonItems[LEFT_BUTTON])
                         {
-                               if (__pButtonItems[MENU_BUTTON])
+                               if(__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                 {
-                                       if(__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                       {
-                                               __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
  
-                                               __highlightedItemIndex = __itemCount;
-                                               __lastHighlightedItemIndex = __highlightedItemIndex;
-                                               __highlighted = true;
-                                       }
-                                       else
+                                       __highlightedItemIndex = __itemCount;
+                                       __lastHighlightedItemIndex = __highlightedItemIndex;
+                                       __highlighted = true;
+                               }
+                               else
+                               {
+                                       if (__pItems.at(__highlightedItemIndex))
                                         {
-                                               if (__pItems.at(__highlightedItemIndex))
+                                               if (__pItems.at(__highlightedItemIndex)->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                 {
-                                                       if (__pItems.at(__highlightedItemIndex)->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                                       __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+
+                                                       __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                       __highlighted = true;
+                                               }
+                                               else
+                                               {
+                                                       for (__highlightedItemIndex = 0; __highlightedItemIndex < __itemCount; __highlightedItemIndex++)
                                                         {
-                                                               __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                                               if (__pItems.at(__highlightedItemIndex)->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                                               {
+                                                                       __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
  
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                               __highlighted = true;
+                                                                       __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                                       __highlighted = true;
+
+                                                                       break;
+                                                               }
                                                         }
-                                                       else
+
+                                                       if (__highlightedItemIndex == __itemCount)
                                                         {
-                                                               for (__highlightedItemIndex = 0; __highlightedItemIndex < __itemCount; __highlightedItemIndex++)
+                                                               if (__pButtonItems[RIGHT_BUTTON])
                                                                 {
-                                                                       if (__pItems.at(__highlightedItemIndex)->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                                                       if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                                         {
-                                                                               __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
  
+                                                                               __highlightedItemIndex = __itemCount + 1;
                                                                                 __lastHighlightedItemIndex = __highlightedItemIndex;
                                                                                 __highlighted = true;
-
-                                                                               break;
-                                                                       }
-                                                               }
-
-                                                               if (__highlightedItemIndex == __itemCount)
-                                                               {
-                                                                       if (__pButtonItems[BACK_BUTTON])
-                                                                       {
-                                                                               if(__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                                               {
-                                                                                       __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                                                                       __highlightedItemIndex = __itemCount + 1;
-                                                                                       __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                                                       __highlighted = true;
-                                                                               }
-                                                                       }
-                                                                       else if (__pButtonItems[RIGHT_BUTTON])
-                                                                       {
-                                                                               if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                                               {
-                                                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                                                                       __highlightedItemIndex = __itemCount + 1;
-                                                                                       __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                                                       __highlighted = true;
-                                                                               }
-                                                                       }
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-                               else if (__pButtonItems[LEFT_BUTTON])
-                               {
-                                       if(__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                       {
-                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                               __highlightedItemIndex = __itemCount;
-                                               __lastHighlightedItemIndex = __highlightedItemIndex;
-                                               __highlighted = true;
-                                       }
-                                       else
-                                       {
-                                               if (__pItems.at(__highlightedItemIndex))
-                                               {
-                                                       if (__pItems.at(__highlightedItemIndex)->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                               __highlighted = true;
-                                                       }
-                                                       else
-                                                       {
-                                                               for (__highlightedItemIndex = 0; __highlightedItemIndex < __itemCount; __highlightedItemIndex++)
-                                                               {
-                                                                       if (__pItems.at(__highlightedItemIndex)->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                                       {
-                                                                               __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                                                               __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                                               __highlighted = true;
-
-                                                                               break;
-                                                                       }
-                                                               }
-
-                                                               if (__highlightedItemIndex == __itemCount)
-                                                               {
-                                                                       if (__pButtonItems[BACK_BUTTON])
-                                                                       {
-                                                                               if(__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                                               {
-                                                                                       __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                                                                       __highlightedItemIndex = __itemCount + 1;
-                                                                                       __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                                                       __highlighted = true;
-                                                                               }
-                                                                       }
-                                                                       else if (__pButtonItems[RIGHT_BUTTON])
-                                                                       {
-                                                                               if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                                               {
-                                                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                                                                       __highlightedItemIndex = __itemCount + 1;
-                                                                                       __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                                                       __highlighted = true;
-                                                                               }
                                                                         }
                                                                 }
                                                         }
@@ -3888,18 +3569,7 @@ _Toolbar::OnFooterFocusGained(const _Control& source)
  
                                                 if (__highlightedItemIndex == __itemCount)
                                                 {
-                                                       if (__pButtonItems[BACK_BUTTON])
-                                                       {
-                                                               if(__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                               {
-                                                                       __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                                                       __highlightedItemIndex = __itemCount;
-                                                                       __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                                       __highlighted = true;
-                                                               }
-                                                       }
-                                                       else if (__pButtonItems[RIGHT_BUTTON])
+                                                       if (__pButtonItems[RIGHT_BUTTON])
                                                         {
                                                                 if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                                 {
@@ -3925,42 +3595,22 @@ _Toolbar::OnFocusLost(const _Control& source)
  {
         if (__itemCount == 0)
         {
-               if (__pButtonItems[LEFT_BUTTON] || __pButtonItems[MENU_BUTTON])
+               if (__pButtonItems[LEFT_BUTTON])
                 {
-                       if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                       if (__pButtonItems[RIGHT_BUTTON])
                         {
                                 if (__highlightedItemIndex == __itemCount)
                                 {
-                                       if (__pButtonItems[MENU_BUTTON])
-                                       {
-                                               if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                               {
-                                                       __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                               }
-                                       }
-                                       else if (__pButtonItems[LEFT_BUTTON])
+                                       if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                         {
-                                               if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                               {
-                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                               }
+                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                         }
                                 }
                                 else if (__highlightedItemIndex == __itemCount + 1)
                                 {
-                                       if (__pButtonItems[BACK_BUTTON])
+                                       if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                         {
-                                               if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                               {
-                                                       __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                               }
-                                       }
-                                       else if (__pButtonItems[RIGHT_BUTTON])
-                                       {
-                                               if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                               {
-                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                               }
+                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                         }
                                 }
                         }
@@ -3968,42 +3618,22 @@ _Toolbar::OnFocusLost(const _Control& source)
                         {
                                 if (__highlightedItemIndex == __itemCount)
                                 {
-                                       if (__pButtonItems[MENU_BUTTON])
-                                       {
-                                               if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                               {
-                                                       __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                               }
-                                       }
-                                       else if (__pButtonItems[LEFT_BUTTON])
+                                       if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                         {
-                                               if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                               {
-                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                               }
+                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                         }
                                 }
                         }
                 }
                 else
                 {
-                       if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                       if (__pButtonItems[RIGHT_BUTTON])
                         {
                                 if (__highlightedItemIndex == __itemCount)
                                 {
-                                       if (__pButtonItems[BACK_BUTTON])
-                                       {
-                                               if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                               {
-                                                       __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                               }
-                                       }
-                                       else if (__pButtonItems[RIGHT_BUTTON])
+                                       if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                         {
-                                               if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                               {
-                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                               }
+                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                         }
                                 }
                         }
@@ -4023,42 +3653,22 @@ _Toolbar::OnFocusLost(const _Control& source)
                 }
                 else
                 {
-                       if (__pButtonItems[LEFT_BUTTON] || __pButtonItems[MENU_BUTTON])
+                       if (__pButtonItems[LEFT_BUTTON])
                         {
-                               if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                               if (__pButtonItems[RIGHT_BUTTON])
                                 {
                                         if (__highlightedItemIndex == __itemCount)
                                         {
-                                               if (__pButtonItems[MENU_BUTTON])
-                                               {
-                                                       if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                       }
-                                               }
-                                               else if (__pButtonItems[LEFT_BUTTON])
+                                               if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                 {
-                                                       if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                       }
+                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                                 }
                                         }
                                         else if (__highlightedItemIndex == __itemCount + 1)
                                         {
-                                               if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                       }
-                                               }
-                                               else if (__pButtonItems[RIGHT_BUTTON])
+                                               if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                 {
-                                                       if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                       }
+                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                                 }
                                         }
                                 }
@@ -4066,42 +3676,22 @@ _Toolbar::OnFocusLost(const _Control& source)
                                 {
                                         if (__highlightedItemIndex == __itemCount)
                                         {
-                                               if (__pButtonItems[MENU_BUTTON])
-                                               {
-                                                       if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                       }
-                                               }
-                                               else if (__pButtonItems[LEFT_BUTTON])
+                                               if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                 {
-                                                       if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                       }
+                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                                 }
                                         }
                                 }
                         }
                         else
                         {
-                               if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                               if (__pButtonItems[RIGHT_BUTTON])
                                 {
                                         if (__highlightedItemIndex == __itemCount)
                                         {
-                                               if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                       }
-                                               }
-                                               else if (__pButtonItems[RIGHT_BUTTON])
+                                               if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                 {
-                                                       if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                       }
+                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                                 }
                                         }
                                 }
@@ -4408,25 +3998,15 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                 {
                         if (__itemCount != 0)
                         {
-                               if (__pButtonItems[LEFT_BUTTON] || __pButtonItems[MENU_BUTTON])
+                               if (__pButtonItems[LEFT_BUTTON])
                                 {
-                                       if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON]) // L Item  R
+                                       if (__pButtonItems[RIGHT_BUTTON]) // L Item  R
                                         {
                                                 if (__highlightedItemIndex == __itemCount)
                                                 {
-                                                       if (__pButtonItems[MENU_BUTTON])
-                                                       {
-                                                               if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                               {
-                                                                       __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                               }
-                                                       }
-                                                       else if (__pButtonItems[LEFT_BUTTON])
+                                                       if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
-                                                               if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                               {
-                                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                               }
+                                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                                         }
  
                                                         __highlightedItemIndex = 0;
@@ -4493,21 +4073,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
  
                                                         __highlightedItemIndex = __itemCount + 1;
  
-                                                       if (__pButtonItems[BACK_BUTTON])
-                                                       {
-                                                               if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                               {
-                                                                       __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                                                       __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                                       __highlighted = true;
-                                                               }
-                                                               else
-                                                               {
-                                                                       OnKeyReleased(source, keyInfo);
-                                                               }
-                                                       }
-                                                       else if (__pButtonItems[RIGHT_BUTTON])
+                                                       if (__pButtonItems[RIGHT_BUTTON])
                                                         {
                                                                 if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                                 {
@@ -4527,19 +4093,9 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                         {
                                                 if (__highlightedItemIndex == __itemCount)
                                                 {
-                                                       if (__pButtonItems[MENU_BUTTON])
-                                                       {
-                                                               if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                               {
-                                                                       __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                               }
-                                                       }
-                                                       else if (__pButtonItems[LEFT_BUTTON])
+                                                       if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
-                                                               if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                               {
-                                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                               }
+                                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                                         }
  
                                                         __highlightedItemIndex = 0;
@@ -4591,7 +4147,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                 }
                                 else // L is null
                                 {
-                                       if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON]) // Item  R, B
+                                       if (__pButtonItems[RIGHT_BUTTON]) // Item  R, B
                                         {
                                                 if (__highlightedItemIndex < __itemCount - 1)
                                                 {
@@ -4643,21 +4199,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
  
                                                         __highlightedItemIndex++;
  
-                                                       if (__pButtonItems[BACK_BUTTON])
-                                                       {
-                                                               if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                               {
-                                                                       __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                                                       __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                                       __highlighted = true;
-                                                               }
-                                                               else
-                                                               {
-                                                                       OnKeyReleased(source, keyInfo);
-                                                               }
-                                                       }
-                                                       else if (__pButtonItems[RIGHT_BUTTON])
+                                                       if (__pButtonItems[RIGHT_BUTTON])
                                                         {
                                                                 if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                                 {
@@ -4733,27 +4275,13 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                         }
                                         else if (__highlightedItemIndex == __itemCount)
                                         {
-                                               if (__pButtonItems[MENU_BUTTON])
-                                               {
-                                                       if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
-                                               }
-                                               else if (__pButtonItems[LEFT_BUTTON])
+                                               if (__pButtonItems[LEFT_BUTTON])
                                                 {
                                                         if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
                                                                 __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                                         }
                                                 }
-                                               else if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
-                                               }
                                                 else if (__pButtonItems[RIGHT_BUTTON])
                                                 {
                                                         if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
@@ -4764,14 +4292,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                         }
                                         else if (__highlightedItemIndex == __itemCount + 1)
                                         {
-                                               if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
-                                               }
-                                               else if (__pButtonItems[RIGHT_BUTTON])
+                                               if (__pButtonItems[RIGHT_BUTTON])
                                                 {
                                                         if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
@@ -4785,22 +4306,15 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                         }
                         else // __itemCount = 0
                         {
-                               if (__pButtonItems[LEFT_BUTTON] || __pButtonItems[MENU_BUTTON])
+                               if (__pButtonItems[LEFT_BUTTON])
                                 {
-                                       if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                                       if (__pButtonItems[RIGHT_BUTTON])
                                         {
                                                 if (__highlightedItemIndex == 0)
                                                 {
                                                         __highlightedItemIndex++;
  
-                                                       if (__pButtonItems[MENU_BUTTON])
-                                                       {
-                                                               if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                               {
-                                                                       __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                               }
-                                                       }
-                                                       else if (__pButtonItems[LEFT_BUTTON])
+                                                       if (__pButtonItems[LEFT_BUTTON])
                                                         {
                                                                 if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                                 {
@@ -4808,21 +4322,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                                 }
                                                         }
  
-                                                       if (__pButtonItems[BACK_BUTTON])
-                                                       {
-                                                               if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                               {
-                                                                       __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                                                       __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                                       __highlighted = true;
-                                                               }
-                                                               else
-                                                               {
-                                                                       OnKeyReleased(source, keyInfo);
-                                                               }
-                                                       }
-                                                       else if (__pButtonItems[RIGHT_BUTTON])
+                                                       if (__pButtonItems[RIGHT_BUTTON])
                                                         {
                                                                 if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                                 {
@@ -4846,27 +4346,13 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
  
                                         if (__highlightedItemIndex == __itemCount)
                                         {
-                                               if (__pButtonItems[MENU_BUTTON])
-                                               {
-                                                       if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
-                                               }
-                                               else if (__pButtonItems[LEFT_BUTTON])
+                                               if (__pButtonItems[LEFT_BUTTON])
                                                 {
                                                         if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
                                                                 __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                                         }
                                                 }
-                                               else if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
-                                               }
                                                 else if (__pButtonItems[RIGHT_BUTTON])
                                                 {
                                                         if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
@@ -4877,14 +4363,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                         }
                                         else if (__highlightedItemIndex == __itemCount + 1)
                                         {
-                                               if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
-                                               }
-                                               else if (__pButtonItems[RIGHT_BUTTON])
+                                               if (__pButtonItems[RIGHT_BUTTON])
                                                 {
                                                         if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
@@ -5117,9 +4596,9 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                 {
                         if (__itemCount != 0)
                         {
-                               if (__pButtonItems[LEFT_BUTTON] || __pButtonItems[MENU_BUTTON])
+                               if (__pButtonItems[LEFT_BUTTON])
                                 {
-                                       if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON]) // L  Item  R
+                                       if (__pButtonItems[RIGHT_BUTTON]) // L  Item  R
                                         {
                                                 if (__highlightedItemIndex == 0)
                                                 {
@@ -5140,21 +4619,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
  
                                                         __highlightedItemIndex = __itemCount;
  
-                                                       if (__pButtonItems[MENU_BUTTON])
-                                                       {
-                                                               if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                               {
-                                                                       __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                                                       __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                                       __highlighted = true;
-                                                               }
-                                                               else
-                                                               {
-                                                                       //empty
-                                                               }
-                                                       }
-                                                       else if (__pButtonItems[LEFT_BUTTON])
+                                                       if (__pButtonItems[LEFT_BUTTON])
                                                         {
                                                                 if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                                 {
@@ -5202,14 +4667,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                 }
                                                 else if (__highlightedItemIndex == __itemCount + 1)
                                                 {
-                                                       if (__pButtonItems[BACK_BUTTON])
-                                                       {
-                                                               if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                               {
-                                                                       __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                               }
-                                                       }
-                                                       else if (__pButtonItems[RIGHT_BUTTON])
+                                                       if (__pButtonItems[RIGHT_BUTTON])
                                                         {
                                                                 if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                                 {
@@ -5253,21 +4711,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
  
                                                         __highlightedItemIndex = __itemCount;
  
-                                                       if (__pButtonItems[MENU_BUTTON])
-                                                       {
-                                                               if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                               {
-                                                                       __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                                                       __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                                       __highlighted = true;
-                                                               }
-                                                               else
-                                                               {
-                                                                       //empty
-                                                               }
-                                                       }
-                                                       else if (__pButtonItems[LEFT_BUTTON])
+                                                       if (__pButtonItems[LEFT_BUTTON])
                                                         {
                                                                 if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                                 {
@@ -5317,7 +4761,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                 }
                                 else // L is null
                                 {
-                                       if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON]) // Item  R
+                                       if (__pButtonItems[RIGHT_BUTTON]) // Item  R
                                         {
                                                 if (__highlightedItemIndex == 0)
                                                 {
@@ -5356,14 +4800,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                                 }
                                                 else if (__highlightedItemIndex == __itemCount)
                                                 {
-                                                       if (__pButtonItems[BACK_BUTTON])
-                                                       {
-                                                               if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                               {
-                                                                       __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                               }
-                                                       }
-                                                       else if (__pButtonItems[RIGHT_BUTTON])
+                                                       if (__pButtonItems[RIGHT_BUTTON])
                                                         {
                                                                 if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                                 {
@@ -5450,27 +4887,13 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                         }
                                         else if (__highlightedItemIndex == __itemCount)
                                         {
-                                               if (__pButtonItems[MENU_BUTTON])
-                                               {
-                                                       if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
-                                               }
-                                               else if (__pButtonItems[LEFT_BUTTON])
+                                               if (__pButtonItems[LEFT_BUTTON])
                                                 {
                                                         if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
                                                                 __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                                         }
                                                 }
-                                               else if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
-                                               }
                                                 else if (__pButtonItems[RIGHT_BUTTON])
                                                 {
                                                         if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
@@ -5481,14 +4904,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                         }
                                         else if (__highlightedItemIndex == __itemCount + 1)
                                         {
-                                               if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
-                                               }
-                                               else if (__pButtonItems[RIGHT_BUTTON])
+                                               if (__pButtonItems[RIGHT_BUTTON])
                                                 {
                                                         if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
@@ -5502,44 +4918,20 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                         }
                         else // __itemCount == 0
                         {
-                               if (__pButtonItems[LEFT_BUTTON] || __pButtonItems[MENU_BUTTON])
+                               if (__pButtonItems[LEFT_BUTTON])
                                 {
-                                       if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
-                                       {
-                                               if (__highlightedItemIndex == __itemCount + 1)
-                                               {
-                                                       if (__pButtonItems[BACK_BUTTON])
-                                                       {
-                                                               if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                               {
-                                                                       __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                               }
-                                                       }
-                                                       else if (__pButtonItems[RIGHT_BUTTON])
-                                                       {
-                                                               if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                               {
-                                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-                                                               }
-                                                       }
-
-                                                       __highlightedItemIndex--;
-
-                                                       if (__pButtonItems[MENU_BUTTON])
-                                                       {
-                                                               if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                               {
-                                                                       __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                                                       __lastHighlightedItemIndex = __highlightedItemIndex;
-                                                                       __highlighted = true;
-                                                               }
-                                                               else
-                                                               {
-                                                                       //empty
-                                                               }
+                                       if (__pButtonItems[RIGHT_BUTTON])
+                                       {
+                                               if (__highlightedItemIndex == __itemCount + 1)
+                                               {
+                                                       if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                                       {
+                                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
                                                         }
-                                                       else if (__pButtonItems[LEFT_BUTTON])
+
+                                                       __highlightedItemIndex--;
+
+                                                       if (__pButtonItems[LEFT_BUTTON])
                                                         {
                                                                 if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                                 {
@@ -5563,27 +4955,13 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
  
                                         if (__highlightedItemIndex == __itemCount)
                                         {
-                                               if (__pButtonItems[MENU_BUTTON])
-                                               {
-                                                       if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
-                                               }
-                                               else if (__pButtonItems[LEFT_BUTTON])
+                                               if (__pButtonItems[LEFT_BUTTON])
                                                 {
                                                         if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
                                                                 __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                                         }
                                                 }
-                                               else if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
-                                               }
                                                 else if (__pButtonItems[RIGHT_BUTTON])
                                                 {
                                                         if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
@@ -5594,14 +4972,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                         }
                                         else if (__highlightedItemIndex == __itemCount + 1)
                                         {
-                                               if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-                                                       }
-                                               }
-                                               else if (__pButtonItems[RIGHT_BUTTON])
+                                               if (__pButtonItems[RIGHT_BUTTON])
                                                 {
                                                         if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
@@ -5620,9 +4991,9 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
         {
                 if (__itemCount != 0)
                 {
-                       if (__pButtonItems[LEFT_BUTTON] || __pButtonItems[MENU_BUTTON])
+                       if (__pButtonItems[LEFT_BUTTON])
                         {
-                               if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON]) // L  Item  R
+                               if (__pButtonItems[RIGHT_BUTTON]) // L  Item  R
                                 {
                                         if (__highlightedItemIndex < __itemCount)
                                         {
@@ -5647,17 +5018,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                         }
                                         else if (__highlightedItemIndex == __itemCount)
                                         {
-                                               if (__pButtonItems[MENU_BUTTON])
-                                               {
-                                                       if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
-
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
-                                                               __highlighted = true;
-                                                       }
-                                               }
-                                               else if (__pButtonItems[LEFT_BUTTON])
+                                               if (__pButtonItems[LEFT_BUTTON])
                                                 {
                                                         if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
@@ -5670,17 +5031,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                         }
                                         else if (__highlightedItemIndex == __itemCount + 1)
                                         {
-                                               if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
-
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount + 1;
-                                                               __highlighted = true;
-                                                       }
-                                               }
-                                               else if (__pButtonItems[RIGHT_BUTTON])
+                                               if (__pButtonItems[RIGHT_BUTTON])
                                                 {
                                                         if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
@@ -5717,17 +5068,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                         }
                                         else if (__highlightedItemIndex == __itemCount)
                                         {
-                                               if (__pButtonItems[MENU_BUTTON])
-                                               {
-                                                       if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
-
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
-                                                               __highlighted = true;
-                                                       }
-                                               }
-                                               else if (__pButtonItems[LEFT_BUTTON])
+                                               if (__pButtonItems[LEFT_BUTTON])
                                                 {
                                                         if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
@@ -5742,7 +5083,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                         }
                         else // L is null
                         {
-                               if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON]) // Item  R
+                               if (__pButtonItems[RIGHT_BUTTON]) // Item  R
                                 {
                                         if (__highlightedItemIndex < __itemCount)
                                         {
@@ -5767,17 +5108,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                         }
                                         else if (__highlightedItemIndex == __itemCount)
                                         {
-                                               if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
-
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
-                                                               __highlighted = true;
-                                                       }
-                                               }
-                                               else if (__pButtonItems[RIGHT_BUTTON])
+                                               if (__pButtonItems[RIGHT_BUTTON])
                                                 {
                                                         if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
@@ -5817,23 +5148,13 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                 }
                 else // __itemCount == 0
                 {
-                       if (__pButtonItems[LEFT_BUTTON] || __pButtonItems[MENU_BUTTON])
+                       if (__pButtonItems[LEFT_BUTTON])
                         {
-                               if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON]) // L   R
+                               if (__pButtonItems[RIGHT_BUTTON]) // L   R
                                 {
                                         if (__highlightedItemIndex == 0)
                                         {
-                                               if (__pButtonItems[MENU_BUTTON])
-                                               {
-                                                       if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
-
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
-                                                               __highlighted = true;
-                                                       }
-                                               }
-                                               else if (__pButtonItems[LEFT_BUTTON])
+                                               if (__pButtonItems[LEFT_BUTTON])
                                                 {
                                                         if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
@@ -5846,17 +5167,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                         }
                                         else if (__highlightedItemIndex == 1)
                                         {
-                                               if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
-
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount + 1;
-                                                               __highlighted = true;
-                                                       }
-                                               }
-                                               else if (__pButtonItems[RIGHT_BUTTON])
+                                               if (__pButtonItems[RIGHT_BUTTON])
                                                 {
                                                         if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
@@ -5872,17 +5183,7 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                 {
                                         if (__highlightedItemIndex == 0)
                                         {
-                                               if (__pButtonItems[MENU_BUTTON])
-                                               {
-                                                       if (__pButtonItems[MENU_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[MENU_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
-
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
-                                                               __highlighted = true;
-                                                       }
-                                               }
-                                               else if (__pButtonItems[LEFT_BUTTON])
+                                               if (__pButtonItems[LEFT_BUTTON])
                                                 {
                                                         if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                         {
@@ -5897,29 +5198,16 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                         }
                         else // L is null
                         {
-                               if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON]) //  R
+                               if (__pButtonItems[RIGHT_BUTTON]) //  R
                                 {
                                         if (__highlightedItemIndex == 0)
                                         {
-                                               if (__pButtonItems[BACK_BUTTON])
-                                               {
-                                                       if (__pButtonItems[BACK_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[BACK_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
-
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
-                                                               __highlighted = true;
-                                                       }
-                                               }
-                                               else if (__pButtonItems[RIGHT_BUTTON])
+                                               if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                                 {
-                                                       if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
-                                                       {
-                                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
+                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
  
-                                                               __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
-                                                               __highlighted = true;
-                                                       }
+                                                       __lastHighlightedItemIndex = __highlightedItemIndex = __itemCount;
+                                                       __highlighted = true;
                                                 }
                                         }
                                 }
@@ -6757,22 +6045,12 @@ _Toolbar::CalculateMinimumToolbarWidth(void)
                         GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_WIDTH, GetOrientation(), itemMinimumWidth);
                         totalWidth += itemMinimumWidth;
                 }
-               else if (IsButtonSet(MENU_BUTTON))
-               {
-                       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_WIDTH, GetOrientation(), itemMinimumWidth);
-                       totalWidth += itemMinimumWidth;
-               }
  
                 if (IsButtonSet(RIGHT_BUTTON))
                 {
                         GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_WIDTH, GetOrientation(), itemMinimumWidth);
                         totalWidth += itemMinimumWidth;
                 }
-               else if (IsButtonSet(BACK_BUTTON))
-               {
-                       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_WIDTH, GetOrientation(), itemMinimumWidth);
-                       totalWidth += itemMinimumWidth;
-               }
         }
  
         if (__style == TOOLBAR_TITLE)
@@ -6852,22 +6130,12 @@ _Toolbar::CalculateMinimumToolbarWidthF(void)
                         GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_WIDTH, GetOrientation(), itemMinimumWidth);
                         totalWidth += itemMinimumWidth;
                 }
-               else if (IsButtonSet(MENU_BUTTON))
-               {
-                       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_WIDTH, GetOrientation(), itemMinimumWidth);
-                       totalWidth += itemMinimumWidth;
-               }
  
                 if (IsButtonSet(RIGHT_BUTTON))
                 {
                         GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_WIDTH, GetOrientation(), itemMinimumWidth);
                         totalWidth += itemMinimumWidth;
                 }
-               else if (IsButtonSet(BACK_BUTTON))
-               {
-                       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_WIDTH, GetOrientation(), itemMinimumWidth);
-                       totalWidth += itemMinimumWidth;
-               }
         }
  
         if (__style == TOOLBAR_TITLE)
@@ -7530,215 +6798,84 @@ _Toolbar::RearrangeItems(void)
                 {
                         if (__pButtonItems[LEFT_BUTTON])
                         {
-                               if (__pButtonItems[BACK_BUTTON])  // L,B
+                               if (__style != TOOLBAR_SOFTKEY)
                                 {
-                                       if (__pButtonItems[MENU_BUTTON])
-                                       {
-                                               __pButtonItems[BACK_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth - footerLeftMargin + rightTouchMargin,
-                                                               (__itemArea.height - footerButtonItemHeight) / 2, footerButtonItemWidth, footerButtonItemHeight));
-
-                                               __pButtonItems[MENU_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
-                                                               footerButtonItemWidth, footerButtonItemHeight));
-
-                                               __pButtonItems[BACK_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                                               __pButtonItems[MENU_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                                       }
-                                       else
-                                       {
-                                               __pButtonItems[BACK_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth - footerLeftMargin + rightTouchMargin,
-                                                               (__itemArea.height - footerButtonItemHeight) / 2, footerButtonItemWidth, footerButtonItemHeight));
+                                       __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth - footerLeftMargin + rightTouchMargin,
+                                                       (__itemArea.height - footerButtonItemHeight) / 2, footerButtonItemWidth, footerButtonItemHeight));
  
-                                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
-                                                               footerButtonItemWidth, footerButtonItemHeight));
+                                       __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
+                                                       footerButtonItemWidth, footerButtonItemHeight));
  
-                                               __pButtonItems[BACK_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                                               __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                                       }
+                                       __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
+                                       __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
                                 }
-                               else // L, R
+                               else
                                 {
-                                       if (__style != TOOLBAR_SOFTKEY)
-                                       {
-                                               if (__pButtonItems[MENU_BUTTON])
-                                               {
-                                                       __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth - footerLeftMargin + rightTouchMargin,
-                                                                       (__itemArea.height - footerButtonItemHeight) / 2, footerButtonItemWidth, footerButtonItemHeight));
-
-                                                       __pButtonItems[MENU_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
-                                                                                                                                                               footerButtonItemWidth, footerButtonItemHeight));
-
-                                                       __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                                                       __pButtonItems[MENU_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                                               }
-                                               else
-                                               {
-                                                       __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth - footerLeftMargin + rightTouchMargin,
-                                                                       (__itemArea.height - footerButtonItemHeight) / 2, footerButtonItemWidth, footerButtonItemHeight));
-
-                                                       __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
-                                                                       footerButtonItemWidth, footerButtonItemHeight));
-
-                                                       __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                                                       __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                                               }
-                                       }
-                                       else
+                                       if (__pButtonItems[RIGHT_BUTTON]->GetText() == L"")
                                         {
-                                               if (__pButtonItems[RIGHT_BUTTON]->GetText() == L"")
-                                               {
-                                                       __pButtonItems[RIGHT_BUTTON]->SetPosition(FloatPoint(__itemArea.width - __pButtonItems[RIGHT_BUTTON]->GetSizeF().width,
+                                               __pButtonItems[RIGHT_BUTTON]->SetPosition(FloatPoint(__itemArea.width - __pButtonItems[RIGHT_BUTTON]->GetSizeF().width,
                                                                 __itemArea.height - __pButtonItems[RIGHT_BUTTON]->GetSizeF().height));
-                                               }
-                                               else
-                                               {
-                                                       __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - softkeyDimension.width, __itemArea.height - softkeyDimension.height,
-                                                                       softkeyDimension.width, softkeyDimension.height));
-                                               }
-
-                                               if (__pButtonItems[LEFT_BUTTON]->GetText() == L"")
-                                               {
-                                                       __pButtonItems[LEFT_BUTTON]->SetPosition(FloatPoint(0.0f, __itemArea.height - __pButtonItems[LEFT_BUTTON]->GetSizeF().height));
-                                               }
-                                               else
-                                               {
-                                                       __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(0.0f, __itemArea.height - softkeyDimension.height,
-                                                                       softkeyDimension.width, softkeyDimension.height));
-                                               }
                                         }
-                               }
-                       }
-                       else
-                       {
-                               if (__pButtonItems[BACK_BUTTON]) // B
-                               {
-                                       if (__pButtonItems[MENU_BUTTON])
+                                       else
                                         {
-                                               __pButtonItems[MENU_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
-                                                               footerButtonItemWidth, footerButtonItemHeight));
-
-                                               __pButtonItems[MENU_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
+                                               __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - softkeyDimension.width, __itemArea.height - softkeyDimension.height,
+                                                               softkeyDimension.width, softkeyDimension.height));
                                         }
-                                       __pButtonItems[BACK_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth - footerLeftMargin + rightTouchMargin,
-                                                       (__itemArea.height - footerButtonItemHeight) / 2, footerButtonItemWidth, footerButtonItemHeight));
  
-                                       __pButtonItems[BACK_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                               }
-                               else // R
-                               {
-                                       if (__style != TOOLBAR_SOFTKEY)
+                                       if (__pButtonItems[LEFT_BUTTON]->GetText() == L"")
                                         {
-                                               if (__pButtonItems[MENU_BUTTON])
-                                               {
-                                                       __pButtonItems[MENU_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
-                                                                       footerButtonItemWidth, footerButtonItemHeight));
-
-                                                       __pButtonItems[MENU_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                                               }
-
-                                               __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth - footerLeftMargin + rightTouchMargin,
-                                                               (__itemArea.height - footerButtonItemHeight) / 2, footerButtonItemWidth, footerButtonItemHeight));
-
-                                               __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
+                                               __pButtonItems[LEFT_BUTTON]->SetPosition(FloatPoint(0.0f, __itemArea.height - __pButtonItems[LEFT_BUTTON]->GetSizeF().height));
                                         }
                                         else
                                         {
-                                               if (__pButtonItems[RIGHT_BUTTON]->GetText() == L"")
-                                               {
-                                                       __pButtonItems[RIGHT_BUTTON]->SetPosition(FloatPoint(__itemArea.width - __pButtonItems[RIGHT_BUTTON]->GetSizeF().width,
-                                                                       __itemArea.height - __pButtonItems[RIGHT_BUTTON]->GetSizeF().height));
-                                               }
-                                               else
-                                               {
-                                                       __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - softkeyDimension.width, __itemArea.height - softkeyDimension.height,
-                                                                       softkeyDimension.width, softkeyDimension.height));
-                                               }
+                                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(0.0f, __itemArea.height - softkeyDimension.height,
+                                                               softkeyDimension.width, softkeyDimension.height));
                                         }
                                 }
                         }
-               }
-               else if (__pButtonItems[LEFT_BUTTON])
-               {
-                       if (__pButtonItems[BACK_BUTTON]) // L B
-                       {
-                               if (__pButtonItems[MENU_BUTTON])
-                               {
-                                       __pButtonItems[BACK_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth - footerLeftMargin + rightTouchMargin,
-                                                       (__itemArea.height - footerButtonItemHeight) / 2, footerButtonItemWidth, footerButtonItemHeight));
-
-                                       __pButtonItems[MENU_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
-                                                       footerButtonItemWidth, footerButtonItemHeight));
-
-                                       __pButtonItems[BACK_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                                       __pButtonItems[MENU_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                               }
-                               else
-                               {
-                                       __pButtonItems[BACK_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth - footerLeftMargin + rightTouchMargin,
-                                                       (__itemArea.height - footerButtonItemHeight) / 2, footerButtonItemWidth, footerButtonItemHeight));
-
-                                       __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
-                                                       footerButtonItemWidth, footerButtonItemHeight));
-
-                                       __pButtonItems[BACK_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                                       __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                               }
-                       }
-                       else // L
+                       else
                         {
                                 if (__style != TOOLBAR_SOFTKEY)
                                 {
-                                       if (__pButtonItems[MENU_BUTTON])
-                                       {
-                                               __pButtonItems[MENU_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
-                                                               footerButtonItemWidth, footerButtonItemHeight));
-
-                                               __pButtonItems[MENU_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                                       }
-                                       else
-                                       {
-                                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
-                                                               footerButtonItemWidth, footerButtonItemHeight));
+                                       __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth - footerLeftMargin + rightTouchMargin,
+                                                       (__itemArea.height - footerButtonItemHeight) / 2, footerButtonItemWidth, footerButtonItemHeight));
  
-                                               __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                                       }
+                                       __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
                                 }
                                 else
                                 {
-                                       if (__pButtonItems[LEFT_BUTTON]->GetText() == L"")
+                                       if (__pButtonItems[RIGHT_BUTTON]->GetText() == L"")
                                         {
-                                               __pButtonItems[LEFT_BUTTON]->SetPosition(FloatPoint(0.0f, __itemArea.height - __pButtonItems[LEFT_BUTTON]->GetSizeF().height));
+                                               __pButtonItems[RIGHT_BUTTON]->SetPosition(FloatPoint(__itemArea.width - __pButtonItems[RIGHT_BUTTON]->GetSizeF().width,
+                                                               __itemArea.height - __pButtonItems[RIGHT_BUTTON]->GetSizeF().height));
                                         }
                                         else
                                         {
-                                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(0.0f, __itemArea.height - softkeyDimension.height,
+                                               __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - softkeyDimension.width, __itemArea.height - softkeyDimension.height,
                                                                 softkeyDimension.width, softkeyDimension.height));
                                         }
                                 }
                         }
                 }
-               else  //B
+               else if (__pButtonItems[LEFT_BUTTON])
                 {
-                       if (__pButtonItems[BACK_BUTTON])
+                       if (__style != TOOLBAR_SOFTKEY)
                         {
-                               if (__pButtonItems[MENU_BUTTON])
-                               {
-                                       __pButtonItems[MENU_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
-                                                       footerButtonItemWidth, footerButtonItemHeight));
-                                       __pButtonItems[MENU_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                               }
-
-                               __pButtonItems[BACK_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth - footerLeftMargin + rightTouchMargin,
-                                               (__itemArea.height - footerButtonItemHeight) / 2, footerButtonItemWidth, footerButtonItemHeight));
+                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
+                                               footerButtonItemWidth, footerButtonItemHeight));
  
-                               __pButtonItems[BACK_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
+                               __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
                         }
                         else
                         {
-                               if (__pButtonItems[MENU_BUTTON])
+                               if (__pButtonItems[LEFT_BUTTON]->GetText() == L"")
                                 {
-                                       __pButtonItems[MENU_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
-                                                       footerButtonItemWidth, footerButtonItemHeight));
-                                       __pButtonItems[MENU_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
+                                       __pButtonItems[LEFT_BUTTON]->SetPosition(FloatPoint(0.0f, __itemArea.height - __pButtonItems[LEFT_BUTTON]->GetSizeF().height));
+                               }
+                               else
+                               {
+                                       __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(0.0f, __itemArea.height - softkeyDimension.height,
+                                                       softkeyDimension.width, softkeyDimension.height));
                                 }
                         }
                 }
@@ -8006,9 +7143,9 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
         }
         else if (__itemCount == 3)
         {
-               if (__pButtonItems[LEFT_BUTTON] || __pButtonItems[MENU_BUTTON])
+               if (__pButtonItems[LEFT_BUTTON])
                 {
-                       if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                       if (__pButtonItems[RIGHT_BUTTON])
                         {
                                 leftMargin = footerLeftMargin;
                                 itemButtonLeftGap = footerLeftMargin;
@@ -8023,7 +7160,7 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
                 }
                 else
                 {
-                       if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                       if (__pButtonItems[RIGHT_BUTTON])
                         {
                                 rightMargin = footerLeftMargin;
                                 itemButtonRightGap = footerLeftMargin;
@@ -8061,38 +7198,9 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
                 GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE_3_ITEM, GetOrientation(), fontSize);
                 GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE_3_ITEM, GetOrientation(), multilineFontSize);
         }
-       else if (__itemCount == 4)
-       {
-               if (__pButtonItems[BACK_BUTTON])
-               {
-                       if (__pButtonItems[MENU_BUTTON])
-                       {
-                               rightMargin = footerLeftMargin;
-                               itemButtonRightGap = footerLeftMargin;
-                               __itemArea.width -= (leftMargin + itemButtonRightGap + iconSize + itemButtonRightGap + iconSize + rightMargin);
-                               leftMargin += (itemButtonRightGap + iconSize);
-                       }
-                       else
-                       {
-                               rightMargin = footerLeftMargin;
-                               itemButtonRightGap = footerLeftMargin;
-                               __itemArea.width -= (leftMargin + itemButtonRightGap + iconSize + rightMargin);
-                       }
-               }
-               else
-               {
-                       if (__pButtonItems[MENU_BUTTON])
-                       {
-                               rightMargin = footerLeftMargin;
-                               itemButtonRightGap = footerLeftMargin;
-                               __itemArea.width -= (leftMargin + itemButtonRightGap + iconSize + rightMargin);
-                               leftMargin += (itemButtonRightGap + iconSize);
-                       }
-                       else
-                       {
-                               __itemArea.width -= leftMargin * 2;
-                       }
-               }
+       else if (__itemCount == 4)
+       {
+               __itemArea.width -= leftMargin * 2;
  
                 blockWidth[0] = blockWidth[1] = blockWidth[2] = blockWidth[3] = (__itemArea.width - dividerWidth * 3) / 4;
  
@@ -8463,9 +7571,9 @@ _Toolbar::RearrangeButtonItems(void)
         }
         else if (__itemCount == 3)
         {
-               if (__pButtonItems[LEFT_BUTTON] || __pButtonItems[MENU_BUTTON])
+               if (__pButtonItems[LEFT_BUTTON])
                 {
-                       if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                       if (__pButtonItems[RIGHT_BUTTON])
                         {
                                 tabLeftMargin = footerLeftMargin;
                                 itemButtonLeftGap = footerLeftMargin;
@@ -8480,7 +7588,7 @@ _Toolbar::RearrangeButtonItems(void)
                 }
                 else
                 {
-                       if (__pButtonItems[RIGHT_BUTTON] || __pButtonItems[BACK_BUTTON])
+                       if (__pButtonItems[RIGHT_BUTTON])
                         {
                                 tabRightMargin = footerLeftMargin;
                                 itemButtonRightGap = footerLeftMargin;
@@ -8519,36 +7627,7 @@ _Toolbar::RearrangeButtonItems(void)
         }
         else if (__itemCount == 4)
         {
-               if (__pButtonItems[BACK_BUTTON])
-               {
-                       if (__pButtonItems[MENU_BUTTON])
-                       {
-                               tabRightMargin = footerLeftMargin;
-                               itemButtonRightGap = footerLeftMargin;
-                               __itemArea.width -= (tabLeftMargin + itemButtonRightGap + iconSize + itemButtonRightGap + iconSize + tabRightMargin);
-                               tabLeftMargin += (itemButtonRightGap + iconSize);
-                       }
-                       else
-                       {
-                               tabRightMargin = footerLeftMargin;
-                               itemButtonRightGap = footerLeftMargin;
-                               __itemArea.width -= (tabLeftMargin + itemButtonRightGap + iconSize + tabRightMargin);
-                       }
-               }
-               else
-               {
-                       if (__pButtonItems[MENU_BUTTON])
-                       {
-                               tabRightMargin = footerLeftMargin;
-                               itemButtonRightGap = footerLeftMargin;
-                               __itemArea.width -= (tabLeftMargin + itemButtonRightGap + iconSize + tabRightMargin);
-                               tabLeftMargin += (itemButtonRightGap + iconSize);
-                       }
-                       else
-                       {
-                               __itemArea.width -= tabLeftMargin * 2;
-                       }
-               }
+               __itemArea.width -= tabLeftMargin * 2;
  
                 blockWidth[0] = blockWidth[1] = blockWidth[2] = blockWidth[3] = (__itemArea.width - dividerWidth * 3) / 4;
  
@@ -8577,36 +7656,7 @@ _Toolbar::RearrangeButtonItems(void)
         }
         else if (__itemCount == 5)
         {
-               if (__pButtonItems[BACK_BUTTON])
-               {
-                       if (__pButtonItems[MENU_BUTTON])
-                       {
-                               tabRightMargin = footerLeftMargin;
-                               itemButtonRightGap = footerLeftMargin;
-                               __itemArea.width -= (tabLeftMargin + itemButtonRightGap + iconSize + itemButtonRightGap + iconSize + tabRightMargin);
-                               tabLeftMargin += (itemButtonRightGap + iconSize);
-                       }
-                       else
-                       {
-                               tabRightMargin = footerLeftMargin;
-                               itemButtonRightGap = footerLeftMargin;
-                               __itemArea.width -= (tabLeftMargin + itemButtonRightGap + iconSize + tabRightMargin);
-                       }
-               }
-               else
-               {
-                       if (__pButtonItems[MENU_BUTTON])
-                       {
-                               tabRightMargin = footerLeftMargin;
-                               itemButtonRightGap = footerLeftMargin;
-                               __itemArea.width -= (tabLeftMargin + itemButtonRightGap + iconSize + tabRightMargin);
-                               tabLeftMargin += (itemButtonRightGap + iconSize);
-                       }
-                       else
-                       {
-                               __itemArea.width -= tabLeftMargin * 2;
-                       }
-               }
+               __itemArea.width -= tabLeftMargin * 2;
  
                 blockWidth[0] = blockWidth[1] = blockWidth[2] = blockWidth[3] = blockWidth[4] = (__itemArea.width - dividerWidth * 4) / 5;
  
@@ -9960,375 +9010,4 @@ _Toolbar::SetTitleNumberedBadgeIcon(int number)
         return E_SUCCESS;
  }
  
-result
-_Toolbar::SetHideButton(bool hideButton)
-{
-       SysTryReturnResult(NID_UI_CTRL, __pButtonItems[BACK_BUTTON], E_INVALID_OPERATION,
-                       "[E_INVALID_OPERATION] BackButton is not exist.");
-
-       Bitmap* pColorReplacedBitmap = null;
-
-       Bitmap* pIconNormalBitmap = null;
-       Bitmap* pIconDisabledBitmap = null;
-       Bitmap* pIconPressedBitmap = null;
-       Bitmap* pIconHighlightedBitmap = null;
-
-       Bitmap* pIconNormalEffectBitmap = null;
-       Bitmap* pIconDisabledEffectBitmap = null;
-       Bitmap* pIconPressedEffectBitmap = null;
-       Bitmap* pIconHighlightedEffectBitmap = null;
-
-       float iconSize = 0.0f;
-       float buttonWidth = __pButtonItems[BACK_BUTTON]->GetSizeF().width;
-       float buttonHeight = __pButtonItems[BACK_BUTTON]->GetSizeF().height;
-       bool customTheme = false;
-
-       float leftTouchMargin = __pButtonItems[BACK_BUTTON]->GetLeftTouchMarginF();
-       float topTouchMargin = __pButtonItems[BACK_BUTTON]->GetTopTouchMarginF();
-       float rightTouchMargin = __pButtonItems[BACK_BUTTON]->GetRightTouchMarginF();
-       float bottomTouchMargin = __pButtonItems[BACK_BUTTON]->GetBottomTouchMarginF();
-
-       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, GetOrientation(), iconSize);
-
-       _AccessibilityElement* pBackButtonElement = __pButtonItems[BACK_BUTTON]->GetAccessibilityContainer()->GetChildElement(0);
-
-       if (hideButton)
-       {
-               GET_BITMAP_CONFIG_N(FOOTER::HIDE_ICON_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconNormalBitmap);
-               GET_BITMAP_CONFIG_N(FOOTER::HIDE_ICON_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pIconDisabledBitmap);
-               GET_BITMAP_CONFIG_N(FOOTER::HIDE_ICON_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pIconPressedBitmap);
-               GET_BITMAP_CONFIG_N(FOOTER::HIDE_ICON_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pIconHighlightedBitmap);
-
-               customTheme = IS_CUSTOM_BITMAP(FOOTER::HIDE_ICON_NORMAL);
-               if (customTheme == false)
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::HIDE_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconNormalEffectBitmap);
-               }
-               else
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconNormalEffectBitmap);
-                       pIconNormalEffectBitmap->SetAlphaConstant(0x00);
-               }
-
-               customTheme = IS_CUSTOM_BITMAP(FOOTER::HIDE_ICON_DISABLED);
-               if (customTheme == false)
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::HIDE_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconDisabledEffectBitmap);
-               }
-               else
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconDisabledEffectBitmap);
-                       pIconDisabledEffectBitmap->SetAlphaConstant(0x00);
-               }
-
-               customTheme = IS_CUSTOM_BITMAP(FOOTER::HIDE_ICON_PRESSED);
-               if (customTheme == false)
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::HIDE_ICON_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pIconPressedEffectBitmap);
-               }
-               else
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconPressedEffectBitmap);
-                       pIconPressedEffectBitmap->SetAlphaConstant(0x00);
-               }
-
-               customTheme = IS_CUSTOM_BITMAP(FOOTER::HIDE_ICON_HIGHLIGHTED);
-               if (customTheme == false)
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::HIDE_ICON_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pIconHighlightedEffectBitmap);
-               }
-               else
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconHighlightedEffectBitmap);
-                       pIconHighlightedEffectBitmap->SetAlphaConstant(0x00);
-               }
-
-               if (pBackButtonElement)
-               {
-                       pBackButtonElement->SetLabel("Hide");
-                       pBackButtonElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
-               }
-       }
-       else
-       {
-               GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconNormalBitmap);
-               GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pIconDisabledBitmap);
-               GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pIconPressedBitmap);
-               GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pIconHighlightedBitmap);
-
-               customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_NORMAL);
-               if (customTheme == false)
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconNormalEffectBitmap);
-               }
-               else
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconNormalEffectBitmap);
-                       pIconNormalEffectBitmap->SetAlphaConstant(0x00);
-               }
-
-               customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_DISABLED);
-               if (customTheme == false)
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconDisabledEffectBitmap);
-               }
-               else
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconDisabledEffectBitmap);
-                       pIconDisabledEffectBitmap->SetAlphaConstant(0x00);
-               }
-
-               customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_PRESSED);
-               if (customTheme == false)
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pIconPressedEffectBitmap);
-               }
-               else
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconPressedEffectBitmap);
-                       pIconPressedEffectBitmap->SetAlphaConstant(0x00);
-               }
-
-               customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_HIGHLIGHTED);
-               if (customTheme == false)
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pIconHighlightedEffectBitmap);
-               }
-               else
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconHighlightedEffectBitmap);
-                       pIconHighlightedEffectBitmap->SetAlphaConstant(0x00);
-               }
-
-               if (pBackButtonElement)
-               {
-                       pBackButtonElement->SetLabel("Back");
-                       pBackButtonElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
-               }
-       }
-
-       Color normalColor;
-       Color disabledColor;
-       Color pressedColor;
-       Color highlightedColor;
-
-       GET_COLOR_CONFIG(FOOTER::BACK_ICON_NORMAL, normalColor);
-       GET_COLOR_CONFIG(FOOTER::BACK_ICON_DISABLED, disabledColor);
-       GET_COLOR_CONFIG(FOOTER::BACK_ICON_PRESSED, pressedColor);
-       GET_COLOR_CONFIG(FOOTER::BACK_ICON_HIGHLIGHTED, highlightedColor);
-
-       if (pIconNormalBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pIconNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), normalColor);
-
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-
-                       __pButtonItems[BACK_BUTTON]->SetBitmap(_BUTTON_STATUS_NORMAL, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
-                                       (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pIconNormalBitmap;
-       }
-
-       if (pIconDisabledBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pIconDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA), disabledColor);
-
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-
-                       __pButtonItems[BACK_BUTTON]->SetBitmap(_BUTTON_STATUS_DISABLED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
-                                       (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pIconDisabledBitmap;
-       }
-
-       if (pIconPressedBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pIconPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), pressedColor);
-
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-
-                       __pButtonItems[BACK_BUTTON]->SetBitmap(_BUTTON_STATUS_PRESSED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
-                                       (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pIconPressedBitmap;
-       }
-
-       if (pIconHighlightedBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pIconHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), highlightedColor);
-
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-
-                       __pButtonItems[BACK_BUTTON]->SetBitmap(_BUTTON_STATUS_HIGHLIGHTED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
-                                       (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pIconHighlightedBitmap;
-       }
-
-       if (pIconNormalEffectBitmap)
-       {
-               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_NORMAL, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
-                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconNormalEffectBitmap);
-
-               delete pIconNormalEffectBitmap;
-       }
-
-       if (pIconDisabledEffectBitmap)
-       {
-               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_DISABLED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
-                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconDisabledEffectBitmap);
-
-               delete pIconDisabledEffectBitmap;
-       }
-
-       if (pIconPressedEffectBitmap)
-       {
-               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_PRESSED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
-                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconPressedEffectBitmap);
-
-               delete pIconPressedEffectBitmap;
-       }
-
-       if (pIconHighlightedEffectBitmap)
-       {
-               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
-                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconHighlightedEffectBitmap);
-
-               delete pIconHighlightedEffectBitmap;
-       }
-
-       return E_SUCCESS;
-}
-
-result
-_Toolbar::SetTransBackButton(bool transparent)
-{
-       SysTryReturnResult(NID_UI_CTRL, __pButtonItems[BACK_BUTTON], E_INVALID_OPERATION,
-                       "[E_INVALID_OPERATION] BackButton is not exist.");
-
-       Bitmap* pIconNormalEffectBitmap = null;
-       Bitmap* pIconDisabledEffectBitmap = null;
-       Bitmap* pIconPressedEffectBitmap = null;
-       Bitmap* pIconHighlightedEffectBitmap = null;
-
-       float iconSize = 0.0f;
-       float buttonWidth = __pButtonItems[BACK_BUTTON]->GetSizeF().width;
-       float buttonHeight = __pButtonItems[BACK_BUTTON]->GetSizeF().height;
-       bool customTheme = false;
-
-       float leftTouchMargin = __pButtonItems[BACK_BUTTON]->GetLeftTouchMarginF();
-       float topTouchMargin = __pButtonItems[BACK_BUTTON]->GetTopTouchMarginF();
-       float rightTouchMargin = __pButtonItems[BACK_BUTTON]->GetRightTouchMarginF();
-       float bottomTouchMargin = __pButtonItems[BACK_BUTTON]->GetBottomTouchMarginF();
-
-       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, GetOrientation(), iconSize);
-
-       if (transparent)
-       {
-               customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_NORMAL);
-               if (customTheme == false)
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_TRANSLUCENT_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconNormalEffectBitmap);
-               }
-
-               customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_DISABLED);
-               if (customTheme == false)
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_TRANSLUCENT_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconDisabledEffectBitmap);
-               }
-
-               customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_PRESSED);
-               if (customTheme == false)
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_TRANSLUCENT_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pIconPressedEffectBitmap);
-               }
-
-               customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_HIGHLIGHTED);
-               if (customTheme == false)
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_TRANSLUCENT_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pIconHighlightedEffectBitmap);
-               }
-       }
-       else
-       {
-               customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_NORMAL);
-               if (customTheme == false)
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconNormalEffectBitmap);
-               }
-
-               customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_DISABLED);
-               if (customTheme == false)
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconDisabledEffectBitmap);
-               }
-
-               customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_PRESSED);
-               if (customTheme == false)
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pIconPressedEffectBitmap);
-               }
-
-               customTheme = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_HIGHLIGHTED);
-               if (customTheme == false)
-               {
-                       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pIconHighlightedEffectBitmap);
-               }
-       }
-
-       if (pIconNormalEffectBitmap)
-       {
-               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_NORMAL, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
-                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconNormalEffectBitmap);
-
-               delete pIconNormalEffectBitmap;
-       }
-
-       if (pIconDisabledEffectBitmap)
-       {
-               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_DISABLED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
-                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconDisabledEffectBitmap);
-
-               delete pIconDisabledEffectBitmap;
-       }
-
-       if (pIconPressedEffectBitmap)
-       {
-               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_PRESSED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
-                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconPressedEffectBitmap);
-
-               delete pIconPressedEffectBitmap;
-       }
-
-       if (pIconHighlightedEffectBitmap)
-       {
-               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
-                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconHighlightedEffectBitmap);
-
-               delete pIconHighlightedEffectBitmap;
-       }
-
-       return E_SUCCESS;
-}
-
  }}} // Tizen::Ui::Controls
diff --git a/src/ui/inc/FUiCtrl_FooterImpl.h b/src/ui/inc/FUiCtrl_FooterImpl.h

index 7fcddc2..1d2ce55 100644 (file)
--- a/src/ui/inc/FUiCtrl_FooterImpl.h
+++ b/src/ui/inc/FUiCtrl_FooterImpl.h
@@ -165,16 +165,6 @@ public:
  
         virtual void OnActionPerformed(const Tizen::Ui::_Control& source, int actionId);
  
-       bool IsMenuButtonSet(void) const;
-
-       ButtonItemStatus GetMenuButtonStatus(void) const;
-
-       result RemoveMenuButton(void);
-
-       result SetMenuButtonEnabled(bool enable);
-
-       result SetMenuButton(void);
-
  
  private:
         result CheckItemValidate(const FooterItem& item);
diff --git a/src/ui/inc/FUiCtrl_Toolbar.h b/src/ui/inc/FUiCtrl_Toolbar.h

index 7c1f8c5..e72976a 100644 (file)
--- a/src/ui/inc/FUiCtrl_Toolbar.h
+++ b/src/ui/inc/FUiCtrl_Toolbar.h
@@ -81,8 +81,6 @@ enum ToolbarButton
         LEFT_BUTTON = 0,
         RIGHT_BUTTON,
         MIDDLE_BUTTON,
-       BACK_BUTTON,
-       MENU_BUTTON,
         BUTTON_MAX
  };
  
@@ -405,10 +403,6 @@ public:
  
         bool IsHeader(void);
  
-       result SetHideButton(bool hideButton);
-
-       result SetTransBackButton(bool transparent);
-
         _ToolbarPresenter* GetPresenter(void) const;
  
  protected:
author	Myung Jin Kim <critical.kim@samsung.com>
	Thu, 20 Jun 2013 12:58:24 +0000 (21:58 +0900)
committer	Myung Jin Kim <critical.kim@samsung.com>
	Thu, 20 Jun 2013 12:58:24 +0000 (21:58 +0900)
inc/FUiCtrlFooter.h		patch \| blob \| history
inc/FUiCtrlHeader.h		patch \| blob \| history
src/ui/controls/FUiCtrlFooter.cpp		patch \| blob \| history
src/ui/controls/FUiCtrl_EditPresenter.cpp		patch \| blob \| history
src/ui/controls/FUiCtrl_FooterImpl.cpp		patch \| blob \| history
src/ui/controls/FUiCtrl_Form.cpp		patch \| blob \| history
src/ui/controls/FUiCtrl_HeaderImpl.cpp		patch \| blob \| history
src/ui/controls/FUiCtrl_Keypad.cpp		patch \| blob \| history
src/ui/controls/FUiCtrl_Toolbar.cpp		patch \| blob \| history
src/ui/inc/FUiCtrl_FooterImpl.h		patch \| blob \| history
src/ui/inc/FUiCtrl_Toolbar.h		patch \| blob \| history