1 files changed, 23 insertions, 14 deletions

diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index a1745ef..fe33c09 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -331,33 +331,41 @@ void FbWinFrame::removeAllButtons() {
     }
 }
 
-void FbWinFrame::addLabelButton(FbTk::TextButton &btn) {
-    LabelList::iterator found_it = find(m_labelbuttons.begin(),
-                                        m_labelbuttons.end(),
-                                        &btn);
+FbWinFrame::ButtonId FbWinFrame::createTab(const std::string &title, FbTk::Command *command) {
+    FbTk::TextButton *button = new FbTk::TextButton(label(),
+                                                    theme().font(),
+                                                    title);
+    button->show();
+    button->setEventMask(ExposureMask | ButtonPressMask |
+                          ButtonReleaseMask | ButtonMotionMask |
+                         EnterWindowMask);
     
-    if (found_it != m_labelbuttons.end())
-        return;
-   
-    btn.setTextPadding(Fluxbox::instance()->getTabsPadding());
-    m_labelbuttons.push_back(&btn);
+    FbTk::RefCount<FbTk::Command> refcmd(command);
+    button->setOnClick(refcmd);
+
+    button->setTextPadding(Fluxbox::instance()->getTabsPadding());
+    button->setJustify(theme().justify());
+
+    m_labelbuttons.push_back(button);
 
     if (currentLabel() == 0)
-        setLabelButtonFocus(btn);
+        setLabelButtonFocus(*button);
+
+    return button;
 }
 
-void FbWinFrame::removeLabelButton(FbTk::TextButton &btn) {
+void FbWinFrame::removeTab(ButtonId btn) {
     LabelList::iterator erase_it = remove(m_labelbuttons.begin(),
                                           m_labelbuttons.end(),
-                                          &btn);
+                                          btn);
     if (erase_it == m_labelbuttons.end())
         return;
 
-    if (&btn == m_current_label)
+    if (btn == m_current_label)
         m_current_label = 0;
 
     m_labelbuttons.erase(erase_it);
-
+    delete btn;
 }
 
 
@@ -550,6 +558,7 @@ void FbWinFrame::setClientWindow(FbTk::FbWindow &win) {
     m_clientarea.raise();
     win.raise();
     m_window.showSubwindows();
+
 }
 
 bool FbWinFrame::hideTitlebar() {