Fixed a pixmap resource leak with selected pixmap in menus.

menu.hilite.selected.pixmap and menu.selected.pixmap was not
deleted while switching between non-pixmap styles and pixmap styles.

1 files changed, 15 insertions, 3 deletions

diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index f4e8f3d..7d50302 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -460,12 +460,24 @@ void Menu::updateMenu(int active_index) {
 
     if (!theme()->selectedPixmap().pixmap().drawable()) {
         int hw = theme()->itemHeight() / 2;
-        theme()->setSelectedPixmap(m_image_ctrl.renderImage(hw, hw, theme()->hiliteTexture()), true);
+        // render image, disable cache and let the theme remove the pixmap
+        theme()->setSelectedPixmap(m_image_ctrl.
+                                   renderImage(hw, hw,
+                                               theme()->hiliteTexture(), ROT0, 
+                                               false // no cache
+                                               ),  
+                                   false); // the theme takes care of this pixmap
 
         if (!theme()->highlightSelectedPixmap().pixmap().drawable()) {
             int hw = theme()->itemHeight() / 2;
-            theme()->setHighlightSelectedPixmap(m_image_ctrl.renderImage(hw, hw, theme()->frameTexture()), true);
-        }
+            // render image, disable cache and let the theme remove the pixmap
+            theme()->setHighlightSelectedPixmap(m_image_ctrl.
+                                                renderImage(hw, hw,
+                                                            theme()->frameTexture(), ROT0, 
+                                                            false  // no cache
+                                                            ), 
+                                                false); // theme takes care of this pixmap
+       }
     }
 
     if (m_title_vis) {