lots and lots of code cleanup, plus introduced new ClientMenu class

1 files changed, 7 insertions, 13 deletions

diff --git a/src/Window.cc b/src/Window.cc
index 9790220..41628f2 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1095,6 +1095,11 @@ void FluxboxWindow::reconfigure() {
         frame().setOnClickTitlebar(null_cmd, 5);
     }
 
+    Client2ButtonMap::iterator it = m_labelbuttons.begin(),
+                               it_end = m_labelbuttons.end();
+    for (; it != it_end; ++it)
+        it->second->setPixmap(screen().getTabsUsePixmap());
+
 }
 
 /// update current client title and title in our frame
@@ -3674,12 +3679,8 @@ bool FluxboxWindow::acceptsFocus() const {
     return (m_client ? m_client->acceptsFocus() : false);
 }
 
-const FbTk::FbPixmap &FluxboxWindow::iconPixmap() const {
-    return (m_client ? m_client->iconPixmap() : m_icon_pixmap);
-}
-
-const FbTk::FbPixmap &FluxboxWindow::iconMask() const {
-    return (m_client ? m_client->iconMask() : m_icon_mask);
+const FbTk::PixmapWithMask &FluxboxWindow::icon() const {
+    return (m_client ? m_client->icon() : m_icon);
 }
 
 const FbTk::Menu &FluxboxWindow::menu() const {
@@ -3704,13 +3705,6 @@ const string &FluxboxWindow::title() const {
     return m_client->title();
 }
 
-const string &FluxboxWindow::iconTitle() const {
-    static string empty_string;
-    if (m_client == 0)
-        return empty_string;
-    return m_client->iconTitle();
-}
-
 int FluxboxWindow::initialState() const { return m_client->initial_state; }
 
 void FluxboxWindow::changeBlackboxHints(const BlackboxHints &net) {